Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

batch-fixes-aug-30 #2054

Merged
merged 2 commits into from
Aug 30, 2023
Merged

batch-fixes-aug-30 #2054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e5639d
batch-fixes-aug-30
leomendoza123 Aug 30, 2023
71a1102
Merge branch 'main' into leo/batch-fixes-aug-30
leomendoza123 Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/app/trusted-summary/component/summary-panel/summary-panel.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,23 @@
{{ activity.startDate }}
<ng-container
i18n="@@shared.to"
*ngIf="activity.endDate || showToPresent"
*ngIf="
(activity.endDate || showToPresent) &&
activity.type !== 'distinction'
"
>to</ng-container
>
</ng-container>
<ng-container *ngIf="activity.endDate">
{{ 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
Expand Down
17 changes: 8 additions & 9 deletions src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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>
Expand Down Expand Up @@ -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">
Expand Down