Merge pull request #2054 from ORCID/leo/batch-fixes-aug-30

batch-fixes-aug-30
ORCID · Aug 30, 2023 · e7046cf · e7046cf
2 parents 42581d5 + 71a1102
commit e7046cf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
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
@@ -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

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
@@ -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">