From f31fdbf3c0b2ddee2032595addeebe1a27066f27 Mon Sep 17 00:00:00 2001
From: andrej romanov <50377758+auumgn@users.noreply.github.com>
Date: Tue, 19 Mar 2024 00:51:49 +0200
Subject: [PATCH 1/5] fix affiliation start and end dates

start and end dates will only be displayed in the following formats: 'yyyy-mm-dd' and 'yyyy-mm'
---
 .../affiliation-detail.component.html         | 347 ++++++++++++------
 .../affiliation-detail.component.ts           |  16 +-
 .../affiliation/affiliations.component.html   |  18 +-
 .../app/affiliation/affiliations.component.ts |  14 +-
 .../app/shared/service/date-util.service.ts   |  16 +
 ui/src/i18n/messages.cs.xlf                   |  90 ++---
 ui/src/i18n/messages.es.xlf                   |  90 ++---
 ui/src/i18n/messages.fr.xlf                   |  90 ++---
 ui/src/i18n/messages.it.xlf                   |  90 ++---
 ui/src/i18n/messages.ja.xlf                   |  90 ++---
 ui/src/i18n/messages.ko.xlf                   |  90 ++---
 ui/src/i18n/messages.pt.xlf                   |  90 ++---
 ui/src/i18n/messages.ru.xlf                   |  90 ++---
 ui/src/i18n/messages.xlf                      |  84 ++---
 ui/src/i18n/messages.zh-CN.xlf                |  90 ++---
 ui/src/i18n/messages.zh-TW.xlf                |  90 ++---
 16 files changed, 780 insertions(+), 615 deletions(-)

diff --git a/ui/src/app/affiliation/affiliation-detail.component.html b/ui/src/app/affiliation/affiliation-detail.component.html
index db6bf7c71..6f3a9b6ed 100644
--- a/ui/src/app/affiliation/affiliation-detail.component.html
+++ b/ui/src/app/affiliation/affiliation-detail.component.html
@@ -1,116 +1,239 @@
 <div class="row justify-content-center">
-    <div class="col-8">
-        <div *ngIf="affiliation">
-            <h1 class="mt-5" i18n="@@gatewayApp.assertionServiceAssertion.detail.title.string">Affiliation details</h1>
-            <hr>
-            <app-error-alert></app-error-alert>
-            <div class="row">
-                <dl class="jh-entity-details">
-                 	<dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.id.string">ID</dt>
-                    <dd class="col-md-9">
-                        {{affiliation.id}}
-                    </dd>
-                    <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.email.string">Email</dt>
-                    <dd class="col-md-9">
-                        {{affiliation.email}}
-                    </dd>
-                    <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.status.string">Status</dt>
-                    <dd class="col-md-9">
-                        {{affiliation.prettyStatus}}
-                    </dd>
-                    <dt *ngIf="affiliation.permissionLink" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.permissionLink.string">Permission link</dt>
-                    <dd *ngIf="affiliation.permissionLink" class="col-md-9">
-                        <button class="btn btn-outline-primary" type="button" [ngxClipboard] [cbContent]="affiliation.permissionLink" (cbOnSuccess)="successMessage()" i18n="@@gatewayApp.assertionServiceAssertion.copyClipboard.string">Copy to clipboard</button>
-                    </dd>
-                    <dt *ngIf="affiliation.orcidId" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.orcidId.string">ORCID iD</dt>
-                    <dd *ngIf="affiliation.orcidId" class="col-md-9">
-                        <a href="{{orcidBaseUrl}}/{{affiliation.orcidId}}" target="_blank">{{orcidBaseUrl}}/{{affiliation.orcidId}}</a>
-                    </dd>
-                    <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.affiliationSection.string">Affiliation Section</dt>
-                    <dd class="col-md-9">
-                        <span i18n="@@{{'gatewayApp.AffiliationSection.' + affiliation.affiliationSection + '.string'}}">{{affiliation.affiliationSection}}</span>
-                    </dd>
-                    <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.detail.org.string">Organization</dt>
-                    <dd class="col-md-9">
-                        {{affiliation.orgName}}: <span *ngIf="affiliation.orgCity">{{affiliation.orgCity}}</span><span *ngIf="affiliation.orgRegion">, {{affiliation.orgRegion}}</span><span *ngIf="affiliation.orgCountry">, {{affiliation.orgCountry}}</span><br>
-                        {{affiliation.disambiguationSource}} {{affiliation.disambiguatedOrgId}}
-                    </dd>
-                    <dt *ngIf="affiliation.departmentName" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.departmentName.string">Department Name</dt>
-                    <dd *ngIf="affiliation.departmentName" class="col-md-9">
-                        {{affiliation.departmentName}}
-                    </dd>
-                    <dt *ngIf="affiliation.roleTitle" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.roleTitle.string">Role Title</dt>
-                    <dd *ngIf="affiliation.roleTitle" class="col-md-9">
-                        {{affiliation.roleTitle}}
-                    </dd>
-                    <dt *ngIf="affiliation.url" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.url.string">Url</dt>
-                    <dd *ngIf="affiliation.url" class="col-md-9">
-                        <a href="{{affiliation.url}}">{{affiliation.url}}</a>
-                    </dd>
-                    <dt *ngIf="affiliation.startYear" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.startDate.string">Start Date</dt>
-                    <dd *ngIf="affiliation.startYear" class="col-md-9">
-                        {{affiliation.startYear!}}<span *ngIf="affiliation.startMonth">-{{affiliation.startMonth}}</span><span *ngIf="affiliation.startMonth&&affiliation.startDay">-{{affiliation.startDay!}}</span>
-                    </dd>
-                    <dt *ngIf="affiliation.endYear" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.endDate.string">End Date</dt>
-                    <dd *ngIf="affiliation.endYear" class="col-md-9">
-                        {{affiliation.endYear!}}<span *ngIf="affiliation.endMonth">-{{affiliation.endMonth}}</span><span *ngIf="affiliation.endMonth&&affiliation.endDay">-{{affiliation.endDay!}}</span>
-                    </dd>
-                    <dt *ngIf="affiliation.externalId" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.externalId.string">External Id</dt>
-                    <dd *ngIf="affiliation.externalId" class="col-md-9">
-                        {{affiliation.externalIdType!}} <a *ngIf="affiliation.externalIdUrl" href="{{affiliation.externalIdUrl}}">{{affiliation.externalId}}</a> <span *ngIf="!affiliation.externalIdUrl">{{affiliation.externalId}}</span>
-                    </dd>
-                    <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.created.string">Created</dt>
-                    <dd class="col-md-9">
-                        {{affiliation.created!.toString() | date:'medium'}}
-                    </dd>
-                    <dt *ngIf="affiliation.addedToORCID" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.addedToOrcid.string">Added To ORCID</dt>
-                    <dd *ngIf="affiliation.addedToORCID" class="col-md-9">
-                        {{affiliation.addedToORCID!.toString() | date:'medium'}}
-                    </dd>
-                    <dt *ngIf="affiliation.updatedInORCID" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.updatedInOrcid.string">Updated In ORCID</dt>
-                    <dd *ngIf="affiliation.updatedInORCID" class="col-md-9">
-                        {{affiliation.updatedInORCID!.toString() | date:'medium'}}
-                    </dd>
-                    <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.modified.string">Modified</dt>
-                    <dd class="col-md-9">
-                        {{affiliation.modified!.toString() | date:'medium'}} <i><span i18n="@@global.by.string">by</span> {{affiliation.lastModifiedBy}}</i>
-                    </dd>
-                    <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.adminId.string">Admin Id</dt>
-                    <dd class="col-md-9">
-                        {{ownerId}}
-                    </dd>
-                    <dt *ngIf="(!affiliation.invitationSent && affiliation.notificationSent) || (affiliation.notificationSent && affiliation.notificationSent < affiliation.invitationSent!)" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.notificationFirstSent.string">Notification First Sent</dt>
-                    <dd *ngIf="(!affiliation.invitationSent && affiliation.notificationSent) || (affiliation.notificationSent && affiliation.notificationSent < affiliation.invitationSent!)" class="col-md-9">
-                        {{affiliation.notificationSent.toString() | date:'medium'}}
-                    </dd>
-                    <dt *ngIf="(!affiliation.notificationSent && affiliation.invitationSent) || (affiliation.invitationSent && affiliation.invitationSent < affiliation.notificationSent!)" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.notificationFirstSent.string">Notification First Sent</dt>
-                    <dd *ngIf="(!affiliation.notificationSent && affiliation.invitationSent) || (affiliation.invitationSent && affiliation.invitationSent < affiliation.notificationSent!)" class="col-md-9">
-                        {{affiliation.invitationSent.toString() | date:'medium'}}
-                    </dd>
-                    <dt *ngIf="(!affiliation.invitationLastSent && affiliation.notificationLastSent) || (affiliation.notificationLastSent && affiliation.notificationLastSent > affiliation.invitationLastSent!)" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.notificationLastSent.string">Notification Last Sent</dt>
-                    <dd *ngIf="(!affiliation.invitationLastSent && affiliation.notificationLastSent) || (affiliation.notificationLastSent && affiliation.notificationLastSent > affiliation.invitationLastSent!)" class="col-md-9">
-                        {{affiliation.notificationLastSent.toString() | date:'medium'}}
-                    </dd>
-                    <dt *ngIf="(!affiliation.notificationLastSent && affiliation.invitationLastSent) || (affiliation.invitationLastSent && affiliation.invitationLastSent > affiliation.notificationLastSent!)" class="col-md-3" i18n="@@gatewayApp.assertionServiceaffiliation.notificationLastSent.string">Notification Last Sent</dt>
-                    <dd *ngIf="(!affiliation.notificationLastSent && affiliation.invitationLastSent) || (affiliation.invitationLastSent && affiliation.invitationLastSent > affiliation.notificationLastSent!)" class="col-md-9">
-                        {{affiliation.invitationLastSent.toString() | date:'medium'}}
-                    </dd>
-                </dl>
-            </div>
-            <hr>
-            <div class="mb-3">
-                <button type="submit"
-                        (click)="previousState()"
-                        class="btn btn-outline-primary mr-2">
-                    <fa-icon [icon]="faArrowLeft"></fa-icon>&nbsp;<span i18n="@@entity.action.back.string"> Back</span>
-                </button>
+  <div class="col-8">
+    <div *ngIf="affiliation">
+      <h1 class="mt-5" i18n="@@gatewayApp.assertionServiceAssertion.detail.title.string">Affiliation details</h1>
+      <hr />
+      <app-error-alert></app-error-alert>
+      <div class="row">
+        <dl class="jh-entity-details">
+          <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.id.string">ID</dt>
+          <dd class="col-md-9">
+            {{ affiliation.id }}
+          </dd>
+          <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.email.string">Email</dt>
+          <dd class="col-md-9">
+            {{ affiliation.email }}
+          </dd>
+          <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.status.string">Status</dt>
+          <dd class="col-md-9">
+            {{ affiliation.prettyStatus }}
+          </dd>
+          <dt
+            *ngIf="affiliation.permissionLink"
+            class="col-md-3"
+            i18n="@@gatewayApp.assertionServiceAssertion.permissionLink.string"
+          >
+            Permission link
+          </dt>
+          <dd *ngIf="affiliation.permissionLink" class="col-md-9">
+            <button
+              class="btn btn-outline-primary"
+              type="button"
+              [ngxClipboard]
+              [cbContent]="affiliation.permissionLink"
+              (cbOnSuccess)="successMessage()"
+              i18n="@@gatewayApp.assertionServiceAssertion.copyClipboard.string"
+            >
+              Copy to clipboard
+            </button>
+          </dd>
+          <dt *ngIf="affiliation.orcidId" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.orcidId.string">
+            ORCID iD
+          </dt>
+          <dd *ngIf="affiliation.orcidId" class="col-md-9">
+            <a href="{{ orcidBaseUrl }}/{{ affiliation.orcidId }}" target="_blank"
+              >{{ orcidBaseUrl }}/{{ affiliation.orcidId }}</a
+            >
+          </dd>
+          <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.affiliationSection.string">
+            Affiliation Section
+          </dt>
+          <dd class="col-md-9">
+            <span i18n="@@{{'gatewayApp.AffiliationSection.' + affiliation.affiliationSection + '.string'}}">{{
+              affiliation.affiliationSection
+            }}</span>
+          </dd>
+          <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.detail.org.string">Organization</dt>
+          <dd class="col-md-9">
+            {{ affiliation.orgName }}: <span *ngIf="affiliation.orgCity">{{ affiliation.orgCity }}</span
+            ><span *ngIf="affiliation.orgRegion">, {{ affiliation.orgRegion }}</span
+            ><span *ngIf="affiliation.orgCountry">, {{ affiliation.orgCountry }}</span
+            ><br />
+            {{ affiliation.disambiguationSource }} {{ affiliation.disambiguatedOrgId }}
+          </dd>
+          <dt
+            *ngIf="affiliation.departmentName"
+            class="col-md-3"
+            i18n="@@gatewayApp.assertionServiceAssertion.departmentName.string"
+          >
+            Department Name
+          </dt>
+          <dd *ngIf="affiliation.departmentName" class="col-md-9">
+            {{ affiliation.departmentName }}
+          </dd>
+          <dt
+            *ngIf="affiliation.roleTitle"
+            class="col-md-3"
+            i18n="@@gatewayApp.assertionServiceAssertion.roleTitle.string"
+          >
+            Role Title
+          </dt>
+          <dd *ngIf="affiliation.roleTitle" class="col-md-9">
+            {{ affiliation.roleTitle }}
+          </dd>
+          <dt *ngIf="affiliation.url" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.url.string">Url</dt>
+          <dd *ngIf="affiliation.url" class="col-md-9">
+            <a href="{{ affiliation.url }}">{{ affiliation.url }}</a>
+          </dd>
+          <dt
+            *ngIf="affiliation.startYear"
+            class="col-md-3"
+            i18n="@@gatewayApp.assertionServiceAssertion.startDate.string"
+          >
+            Start Date
+          </dt>
+          <dd *ngIf="affiliation.startYear" class="col-md-9">
+            {{ startDate }}
+          </dd>
+          <dt *ngIf="affiliation.endYear" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.endDate.string">
+            End Date
+          </dt>
+          <dd *ngIf="affiliation.endYear" class="col-md-9">
+            {{ endDate }}
+          </dd>
+          <dt
+            *ngIf="affiliation.externalId"
+            class="col-md-3"
+            i18n="@@gatewayApp.assertionServiceAssertion.externalId.string"
+          >
+            External Id
+          </dt>
+          <dd *ngIf="affiliation.externalId" class="col-md-9">
+            {{ affiliation.externalIdType! }}
+            <a *ngIf="affiliation.externalIdUrl" href="{{ affiliation.externalIdUrl }}">{{ affiliation.externalId }}</a>
+            <span *ngIf="!affiliation.externalIdUrl">{{ affiliation.externalId }}</span>
+          </dd>
+          <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.created.string">Created</dt>
+          <dd class="col-md-9">
+            {{ affiliation.created!.toString() | date: 'medium' }}
+          </dd>
+          <dt
+            *ngIf="affiliation.addedToORCID"
+            class="col-md-3"
+            i18n="@@gatewayApp.assertionServiceAssertion.addedToOrcid.string"
+          >
+            Added To ORCID
+          </dt>
+          <dd *ngIf="affiliation.addedToORCID" class="col-md-9">
+            {{ affiliation.addedToORCID!.toString() | date: 'medium' }}
+          </dd>
+          <dt
+            *ngIf="affiliation.updatedInORCID"
+            class="col-md-3"
+            i18n="@@gatewayApp.assertionServiceAssertion.updatedInOrcid.string"
+          >
+            Updated In ORCID
+          </dt>
+          <dd *ngIf="affiliation.updatedInORCID" class="col-md-9">
+            {{ affiliation.updatedInORCID!.toString() | date: 'medium' }}
+          </dd>
+          <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.modified.string">Modified</dt>
+          <dd class="col-md-9">
+            {{ affiliation.modified!.toString() | date: 'medium' }}
+            <i><span i18n="@@global.by.string">by</span> {{ affiliation.lastModifiedBy }}</i>
+          </dd>
+          <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.adminId.string">Admin Id</dt>
+          <dd class="col-md-9">
+            {{ ownerId }}
+          </dd>
+          <dt
+            *ngIf="
+              (!affiliation.invitationSent && affiliation.notificationSent) ||
+              (affiliation.notificationSent && affiliation.notificationSent < affiliation.invitationSent!)
+            "
+            class="col-md-3"
+            i18n="@@gatewayApp.assertionServiceAssertion.notificationFirstSent.string"
+          >
+            Notification First Sent
+          </dt>
+          <dd
+            *ngIf="
+              (!affiliation.invitationSent && affiliation.notificationSent) ||
+              (affiliation.notificationSent && affiliation.notificationSent < affiliation.invitationSent!)
+            "
+            class="col-md-9"
+          >
+            {{ affiliation.notificationSent.toString() | date: 'medium' }}
+          </dd>
+          <dt
+            *ngIf="
+              (!affiliation.notificationSent && affiliation.invitationSent) ||
+              (affiliation.invitationSent && affiliation.invitationSent < affiliation.notificationSent!)
+            "
+            class="col-md-3"
+            i18n="@@gatewayApp.assertionServiceAssertion.notificationFirstSent.string"
+          >
+            Notification First Sent
+          </dt>
+          <dd
+            *ngIf="
+              (!affiliation.notificationSent && affiliation.invitationSent) ||
+              (affiliation.invitationSent && affiliation.invitationSent < affiliation.notificationSent!)
+            "
+            class="col-md-9"
+          >
+            {{ affiliation.invitationSent.toString() | date: 'medium' }}
+          </dd>
+          <dt
+            *ngIf="
+              (!affiliation.invitationLastSent && affiliation.notificationLastSent) ||
+              (affiliation.notificationLastSent && affiliation.notificationLastSent > affiliation.invitationLastSent!)
+            "
+            class="col-md-3"
+            i18n="@@gatewayApp.assertionServiceAssertion.notificationLastSent.string"
+          >
+            Notification Last Sent
+          </dt>
+          <dd
+            *ngIf="
+              (!affiliation.invitationLastSent && affiliation.notificationLastSent) ||
+              (affiliation.notificationLastSent && affiliation.notificationLastSent > affiliation.invitationLastSent!)
+            "
+            class="col-md-9"
+          >
+            {{ affiliation.notificationLastSent.toString() | date: 'medium' }}
+          </dd>
+          <dt
+            *ngIf="
+              (!affiliation.notificationLastSent && affiliation.invitationLastSent) ||
+              (affiliation.invitationLastSent && affiliation.invitationLastSent > affiliation.notificationLastSent!)
+            "
+            class="col-md-3"
+            i18n="@@gatewayApp.assertionServiceaffiliation.notificationLastSent.string"
+          >
+            Notification Last Sent
+          </dt>
+          <dd
+            *ngIf="
+              (!affiliation.notificationLastSent && affiliation.invitationLastSent) ||
+              (affiliation.invitationLastSent && affiliation.invitationLastSent > affiliation.notificationLastSent!)
+            "
+            class="col-md-9"
+          >
+            {{ affiliation.invitationLastSent.toString() | date: 'medium' }}
+          </dd>
+        </dl>
+      </div>
+      <hr />
+      <div class="mb-3">
+        <button type="submit" (click)="previousState()" class="btn btn-outline-primary mr-2">
+          <fa-icon [icon]="faArrowLeft"></fa-icon>&nbsp;<span i18n="@@entity.action.back.string"> Back</span>
+        </button>
 
-                <button type="button"
-                        [routerLink]="['/affiliation', affiliation!.id, 'edit']"
-                        class="btn btn-primary">
-                    <fa-icon [icon]="faPencilAlt"></fa-icon>&nbsp;<span i18n="@@entity.action.edit.string"> Edit</span>
-                </button>
-            </div>
-        </div>
+        <button type="button" [routerLink]="['/affiliation', affiliation!.id, 'edit']" class="btn btn-primary">
+          <fa-icon [icon]="faPencilAlt"></fa-icon>&nbsp;<span i18n="@@entity.action.edit.string"> Edit</span>
+        </button>
+      </div>
     </div>
+  </div>
 </div>
diff --git a/ui/src/app/affiliation/affiliation-detail.component.ts b/ui/src/app/affiliation/affiliation-detail.component.ts
index 6131775e6..3fa977592 100644
--- a/ui/src/app/affiliation/affiliation-detail.component.ts
+++ b/ui/src/app/affiliation/affiliation-detail.component.ts
@@ -4,6 +4,7 @@ import { ORCID_BASE_URL } from '../app.constants'
 import { ActivatedRoute } from '@angular/router'
 import { UserService } from '../user/service/user.service'
 import { faPencilAlt, faArrowLeft } from '@fortawesome/free-solid-svg-icons'
+import { DateUtilService } from '../shared/service/date-util.service'
 
 @Component({
   selector: 'app-affiliation-detail',
@@ -15,15 +16,28 @@ export class AffiliationDetailComponent implements OnInit {
   ownerId: string | undefined
   faPencilAlt = faPencilAlt
   faArrowLeft = faArrowLeft
+  startDate: string | undefined
+  endDate: string | undefined
 
   constructor(
     protected activatedRoute: ActivatedRoute,
-    protected userService: UserService
+    protected userService: UserService,
+    protected dateUtilService: DateUtilService
   ) {}
 
   ngOnInit() {
     this.activatedRoute.data.subscribe(({ affiliation }) => {
       this.affiliation = affiliation
+      this.startDate = this.dateUtilService.formatDate({
+        year: affiliation.startYear,
+        month: affiliation.startMonth,
+        day: affiliation.startDay,
+      })
+      this.endDate = this.dateUtilService.formatDate({
+        year: affiliation.endYear,
+        month: affiliation.endMonth,
+        day: affiliation.endDay,
+      })
       this.userService.find(this.affiliation!.ownerId!).subscribe((user) => {
         this.ownerId = user.email
       })
diff --git a/ui/src/app/affiliation/affiliations.component.html b/ui/src/app/affiliation/affiliations.component.html
index 99b28bfcd..58be543d5 100644
--- a/ui/src/app/affiliation/affiliations.component.html
+++ b/ui/src/app/affiliation/affiliations.component.html
@@ -174,23 +174,23 @@ <h1 id="page-heading" class="mt-3" i18n="@@gatewayApp.assertionServiceAssertion.
             ><br />
             <span *ngIf="affiliation.departmentName">{{ affiliation.departmentName }}</span
             ><span *ngIf="affiliation.roleTitle"> ({{ affiliation.roleTitle }})</span><br />
-            <span *ngIf="affiliation.startYear">{{ affiliation.startYear }}</span
-            ><span *ngIf="affiliation.startMonth">-{{ affiliation.startMonth }}</span
-            ><span *ngIf="affiliation.startDay">-{{ affiliation.startDay }}</span>
+            <span *ngIf="affiliation.startYear"
+              >{{ formatDate(affiliation.startYear, affiliation.startMonth, affiliation.startDay) }}
+            </span>
             <span
               *ngIf="affiliation.startYear && affiliation.endYear"
-              i18n="@@gatewayApp.assertionServiceaffiliation.dateRange.string"
+              i18n="@@gatewayApp.assertionServiceAssertion.dateRange.string"
               >to</span
             >
-            <span *ngIf="affiliation.endYear">{{ affiliation.endYear }}</span
-            ><span *ngIf="affiliation.endMonth">-{{ affiliation.endMonth }}</span
-            ><span *ngIf="affiliation.endDay">-{{ affiliation.endDay }} </span> <br /><a
+            <span *ngIf="affiliation.endYear">
+              {{ formatDate(affiliation.endYear, affiliation.endMonth, affiliation.endDay) }}</span
+            ><br /><a
               i18n="@@gatewayApp.assertionServiceAssertion.details.string"
               [routerLink]="['/affiliations', affiliation.id, 'view']"
               >View details</a
             >
           </td>
-          <td>{{ affiliation.created?.toString() | date: 'medium' }}</td>
+          <td>{{ affiliation.created?.toDate() | date: 'medium' : 'en-US' }}</td>
           <td class="assertion-status" *ngIf="affiliation.prettyStatus">
             <span>{{ affiliation.prettyStatus | localize }}</span>
             <div
@@ -252,4 +252,4 @@ <h1 id="page-heading" class="mt-3" i18n="@@gatewayApp.assertionServiceAssertion.
     </div>
   </div>
 </div>
-<router-outlet name="popup"></router-outlet>
\ No newline at end of file
+<router-outlet name="popup"></router-outlet>
diff --git a/ui/src/app/affiliation/affiliations.component.ts b/ui/src/app/affiliation/affiliations.component.ts
index dbfb35ab2..3a4f11860 100644
--- a/ui/src/app/affiliation/affiliations.component.ts
+++ b/ui/src/app/affiliation/affiliations.component.ts
@@ -21,6 +21,7 @@ import { AccountService } from '../account'
 import { AlertService } from '../shared/service/alert.service'
 import { ActivatedRoute, Router } from '@angular/router'
 import { EventService } from '../shared/service/event.service'
+import { DateUtilService } from '../shared/service/date-util.service'
 
 @Component({
   selector: 'app-affiliations',
@@ -47,6 +48,8 @@ export class AffiliationsComponent implements OnInit, OnDestroy {
   ascending: any
   orcidBaseUrl: string | undefined = ORCID_BASE_URL
   itemCount: string | undefined
+  startDate: string | undefined
+  endDate: string | undefined
   faChartBar = faChartBar
   faFileDownload = faFileDownload
   faFileImport = faFileImport
@@ -71,7 +74,8 @@ export class AffiliationsComponent implements OnInit, OnDestroy {
     protected activatedRoute: ActivatedRoute,
     protected router: Router,
     protected eventService: EventService,
-    protected translate: LanguageService
+    protected translate: LanguageService,
+    protected dateUtilService: DateUtilService
   ) {
     this.itemsPerPage = ITEMS_PER_PAGE
   }
@@ -137,6 +141,14 @@ export class AffiliationsComponent implements OnInit, OnDestroy {
     this.loadAll()
   }
 
+  formatDate(year?: string, month?: string, day?: string) {
+    return this.dateUtilService.formatDate({
+      year,
+      month,
+      day,
+    })
+  }
+
   clear() {
     this.page = 0
     this.router.navigate([
diff --git a/ui/src/app/shared/service/date-util.service.ts b/ui/src/app/shared/service/date-util.service.ts
index 10611303d..630027b39 100644
--- a/ui/src/app/shared/service/date-util.service.ts
+++ b/ui/src/app/shared/service/date-util.service.ts
@@ -72,4 +72,20 @@ export class DateUtilService {
     }
     return days
   }
+
+  formatDate({ year, month, day }: { year?: string; month?: string; day?: string }): string {
+    let date = ''
+    if (year) {
+      date = year
+
+      if (month && parseInt(month) > 0) {
+        date += `-${month.padStart(2, '0')}`
+
+        if (day && parseInt(day) > 0) {
+          date += `-${day.padStart(2, '0')}`
+        }
+      }
+    }
+    return date
+  }
 }
diff --git a/ui/src/i18n/messages.cs.xlf b/ui/src/i18n/messages.cs.xlf
index f33473a44..70abfc2fc 100644
--- a/ui/src/i18n/messages.cs.xlf
+++ b/ui/src/i18n/messages.cs.xlf
@@ -1363,7 +1363,7 @@
         <target state="new">podle</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">143</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/user-detail.component.html</context>
@@ -1391,7 +1391,7 @@
         <target state="new">Zpět</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">230</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/user-detail.component.html</context>
@@ -1403,7 +1403,7 @@
         <target state="new">Upravit</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">111</context>
+          <context context-type="linenumber">234</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
@@ -1547,7 +1547,7 @@
         <target state="new">Zobrazují se položky <x id="PH" equiv-text="first"></x> – <x id="PH_1" equiv-text="second"></x> z <x id="PH_2" equiv-text="this.totalItems"></x></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.ts</context>
-          <context context-type="linenumber">216</context>
+          <context context-type="linenumber">228</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/users.component.ts</context>
@@ -1768,11 +1768,11 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.orcidId.string" datatype="html">
-        <source>ORCID iD</source>
+        <source> ORCID iD </source>
         <target state="new">ORCID iD</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">25</context>
+          <context context-type="linenumber">40</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
@@ -1809,23 +1809,23 @@
       </trans-unit>
       <trans-unit id="{{&apos;gatewayApp.AffiliationSection.&apos; + affiliation.affiliationSection + &apos;.string&apos;}}" datatype="html">
         <source>
-          <x id="INTERPOLATION" equiv-text="{{affiliation.affiliationSection}}"></x>
+          <x id="INTERPOLATION" equiv-text="{{ affiliation.affiliationSection }}"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION" equiv-text="{{affiliation.affiliationSection}}"></x>
+          <x id="INTERPOLATION" equiv-text="{{ affiliation.affiliationSection }}"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="linenumber">52</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
           <context context-type="linenumber">167</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="gatewayApp.assertionServiceaffiliation.dateRange.string" datatype="html">
+      <trans-unit id="gatewayApp.assertionServiceAssertion.dateRange.string" datatype="html">
         <source>to</source>
-        <target state="new">to</target>
+        <target state="new">do</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
           <context context-type="linenumber">183</context>
@@ -1976,27 +1976,27 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.permissionLink.string" datatype="html">
-        <source>Permission link</source>
+        <source> Permission link </source>
         <target state="new">Odkaz na povolení</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.copyClipboard.string" datatype="html">
-        <source>Copy to clipboard</source>
+        <source> Copy to clipboard </source>
         <target state="new">Zkopírovat do schránky</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">23</context>
+          <context context-type="linenumber">36</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.affiliationSection.string" datatype="html">
-        <source>Affiliation Section</source>
+        <source> Affiliation Section </source>
         <target state="new">Typ přidružení</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">29</context>
+          <context context-type="linenumber">48</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2008,15 +2008,15 @@
         <target state="new">Organizace</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.departmentName.string" datatype="html">
-        <source>Department Name</source>
+        <source> Department Name </source>
         <target state="new">Oddělení</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">68</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2024,11 +2024,11 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.roleTitle.string" datatype="html">
-        <source>Role Title</source>
+        <source> Role Title </source>
         <target state="new">Role/Funkce</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">42</context>
+          <context context-type="linenumber">78</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2040,7 +2040,7 @@
         <target state="new">URL</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">46</context>
+          <context context-type="linenumber">84</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2048,27 +2048,27 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.startDate.string" datatype="html">
-        <source>Start Date</source>
+        <source> Start Date </source>
         <target state="new">Datum začátku</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">50</context>
+          <context context-type="linenumber">92</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.endDate.string" datatype="html">
-        <source>End Date</source>
+        <source> End Date </source>
         <target state="new">Datum ukončení</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">54</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.externalId.string" datatype="html">
-        <source>External Id</source>
+        <source> External Id </source>
         <target state="new">Externí ID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">58</context>
+          <context context-type="linenumber">108</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2080,23 +2080,23 @@
         <target state="new">Vytvořeno</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">116</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.addedToOrcid.string" datatype="html">
-        <source>Added To ORCID</source>
+        <source> Added To ORCID </source>
         <target state="new">Přidáno do ORCID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">66</context>
+          <context context-type="linenumber">124</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.updatedInOrcid.string" datatype="html">
-        <source>Updated In ORCID</source>
+        <source> Updated In ORCID </source>
         <target state="new">Aktualizováno v ORCID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">134</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.modified.string" datatype="html">
@@ -2104,7 +2104,7 @@
         <target state="new">Upraveno</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">140</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.adminId.string" datatype="html">
@@ -2112,35 +2112,35 @@
         <target state="new">Identifikace správce</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">145</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.notificationFirstSent.string" datatype="html">
-        <source>Notification First Sent</source>
+        <source> Notification First Sent </source>
         <target state="new">Oznámení odeslané jako první</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">156</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">175</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.notificationLastSent.string" datatype="html">
-        <source>Notification Last Sent</source>
+        <source> Notification Last Sent </source>
         <target state="new">Oznámení naposledy odesláno</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">90</context>
+          <context context-type="linenumber">194</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceaffiliation.notificationLastSent.string" datatype="html">
-        <source>Notification Last Sent</source>
-        <target state="new">Notification Last Sent</target>
+        <source> Notification Last Sent </source>
+        <target state="new"> Notification Last Sent </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">213</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.copySuccess.string" datatype="html">
@@ -2148,7 +2148,7 @@
         <target state="new">Zkopírováno do schránky</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.ts</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">52</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.import.title.string" datatype="html">
diff --git a/ui/src/i18n/messages.es.xlf b/ui/src/i18n/messages.es.xlf
index 7d0e6888d..8e84c016b 100644
--- a/ui/src/i18n/messages.es.xlf
+++ b/ui/src/i18n/messages.es.xlf
@@ -1363,7 +1363,7 @@
         <target state="new">por</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">143</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/user-detail.component.html</context>
@@ -1391,7 +1391,7 @@
         <target state="new">Volver</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">230</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/user-detail.component.html</context>
@@ -1403,7 +1403,7 @@
         <target state="new">Editar</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">111</context>
+          <context context-type="linenumber">234</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
@@ -1547,7 +1547,7 @@
         <target state="new">Mostrando <x id="PH" equiv-text="first"></x> - <x id="PH_1" equiv-text="second"></x> de <x id="PH_2" equiv-text="this.totalItems"></x> elementos.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.ts</context>
-          <context context-type="linenumber">216</context>
+          <context context-type="linenumber">228</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/users.component.ts</context>
@@ -1768,11 +1768,11 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.orcidId.string" datatype="html">
-        <source>ORCID iD</source>
+        <source> ORCID iD </source>
         <target state="new">ORCID iD</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">25</context>
+          <context context-type="linenumber">40</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
@@ -1809,23 +1809,23 @@
       </trans-unit>
       <trans-unit id="{{&apos;gatewayApp.AffiliationSection.&apos; + affiliation.affiliationSection + &apos;.string&apos;}}" datatype="html">
         <source>
-          <x id="INTERPOLATION" equiv-text="{{affiliation.affiliationSection}}"></x>
+          <x id="INTERPOLATION" equiv-text="{{ affiliation.affiliationSection }}"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION" equiv-text="{{affiliation.affiliationSection}}"></x>
+          <x id="INTERPOLATION" equiv-text="{{ affiliation.affiliationSection }}"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="linenumber">52</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
           <context context-type="linenumber">167</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="gatewayApp.assertionServiceaffiliation.dateRange.string" datatype="html">
+      <trans-unit id="gatewayApp.assertionServiceAssertion.dateRange.string" datatype="html">
         <source>to</source>
-        <target state="new">to</target>
+        <target state="new">al</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
           <context context-type="linenumber">183</context>
@@ -1976,28 +1976,28 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.permissionLink.string" datatype="html">
-        <source>Permission link</source>
+        <source> Permission link </source>
         <target state="new">Enlace de permiso</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.copyClipboard.string" datatype="html">
-        <source>Copy to clipboard</source>
+        <source> Copy to clipboard </source>
         <target state="new">Copiar al portapapeles
 </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">23</context>
+          <context context-type="linenumber">36</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.affiliationSection.string" datatype="html">
-        <source>Affiliation Section</source>
+        <source> Affiliation Section </source>
         <target state="new">Tipo de afiliación</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">29</context>
+          <context context-type="linenumber">48</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2009,15 +2009,15 @@
         <target state="new">Organización</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.departmentName.string" datatype="html">
-        <source>Department Name</source>
+        <source> Department Name </source>
         <target state="new">Departamento</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">68</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2025,11 +2025,11 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.roleTitle.string" datatype="html">
-        <source>Role Title</source>
+        <source> Role Title </source>
         <target state="new">Rol/título</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">42</context>
+          <context context-type="linenumber">78</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2041,7 +2041,7 @@
         <target state="new">URL</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">46</context>
+          <context context-type="linenumber">84</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2049,27 +2049,27 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.startDate.string" datatype="html">
-        <source>Start Date</source>
+        <source> Start Date </source>
         <target state="new">Fecha de inicio</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">50</context>
+          <context context-type="linenumber">92</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.endDate.string" datatype="html">
-        <source>End Date</source>
+        <source> End Date </source>
         <target state="new">Fecha de término</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">54</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.externalId.string" datatype="html">
-        <source>External Id</source>
+        <source> External Id </source>
         <target state="new">ID externa</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">58</context>
+          <context context-type="linenumber">108</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2081,23 +2081,23 @@
         <target state="new">Creado</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">116</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.addedToOrcid.string" datatype="html">
-        <source>Added To ORCID</source>
+        <source> Added To ORCID </source>
         <target state="new">Añadido a ORCID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">66</context>
+          <context context-type="linenumber">124</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.updatedInOrcid.string" datatype="html">
-        <source>Updated In ORCID</source>
+        <source> Updated In ORCID </source>
         <target state="new">Actualizado en ORCID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">134</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.modified.string" datatype="html">
@@ -2105,7 +2105,7 @@
         <target state="new">Modificado</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">140</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.adminId.string" datatype="html">
@@ -2113,35 +2113,35 @@
         <target state="new">Identificación de administrador</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">145</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.notificationFirstSent.string" datatype="html">
-        <source>Notification First Sent</source>
+        <source> Notification First Sent </source>
         <target state="new">Primera notificación enviada</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">156</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">175</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.notificationLastSent.string" datatype="html">
-        <source>Notification Last Sent</source>
+        <source> Notification Last Sent </source>
         <target state="new">Última notificación enviada</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">90</context>
+          <context context-type="linenumber">194</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceaffiliation.notificationLastSent.string" datatype="html">
-        <source>Notification Last Sent</source>
-        <target state="new">Notification Last Sent</target>
+        <source> Notification Last Sent </source>
+        <target state="new"> Notification Last Sent </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">213</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.copySuccess.string" datatype="html">
@@ -2149,7 +2149,7 @@
         <target state="new">Copiado al portapapeles</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.ts</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">52</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.import.title.string" datatype="html">
diff --git a/ui/src/i18n/messages.fr.xlf b/ui/src/i18n/messages.fr.xlf
index 178462ebb..b427fca1d 100644
--- a/ui/src/i18n/messages.fr.xlf
+++ b/ui/src/i18n/messages.fr.xlf
@@ -1365,7 +1365,7 @@
         <target state="new">par</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">143</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/user-detail.component.html</context>
@@ -1393,7 +1393,7 @@
         <target state="new">Retour</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">230</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/user-detail.component.html</context>
@@ -1405,7 +1405,7 @@
         <target state="new">Modifier</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">111</context>
+          <context context-type="linenumber">234</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
@@ -1549,7 +1549,7 @@
         <target state="new">Montrer entre <x id="PH" equiv-text="first"></x> et <x id="PH_1" equiv-text="second"></x> éléments sur <x id="PH_2" equiv-text="this.totalItems"></x>.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.ts</context>
-          <context context-type="linenumber">216</context>
+          <context context-type="linenumber">228</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/users.component.ts</context>
@@ -1770,11 +1770,11 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.orcidId.string" datatype="html">
-        <source>ORCID iD</source>
+        <source> ORCID iD </source>
         <target state="new">Identifiant ORCID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">25</context>
+          <context context-type="linenumber">40</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
@@ -1811,23 +1811,23 @@
       </trans-unit>
       <trans-unit id="{{&apos;gatewayApp.AffiliationSection.&apos; + affiliation.affiliationSection + &apos;.string&apos;}}" datatype="html">
         <source>
-          <x id="INTERPOLATION" equiv-text="{{affiliation.affiliationSection}}"></x>
+          <x id="INTERPOLATION" equiv-text="{{ affiliation.affiliationSection }}"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION" equiv-text="{{affiliation.affiliationSection}}"></x>
+          <x id="INTERPOLATION" equiv-text="{{ affiliation.affiliationSection }}"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="linenumber">52</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
           <context context-type="linenumber">167</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="gatewayApp.assertionServiceaffiliation.dateRange.string" datatype="html">
+      <trans-unit id="gatewayApp.assertionServiceAssertion.dateRange.string" datatype="html">
         <source>to</source>
-        <target state="new">to</target>
+        <target state="new">au</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
           <context context-type="linenumber">183</context>
@@ -1978,27 +1978,27 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.permissionLink.string" datatype="html">
-        <source>Permission link</source>
+        <source> Permission link </source>
         <target state="new">Lien de l&apos;autorisation</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.copyClipboard.string" datatype="html">
-        <source>Copy to clipboard</source>
+        <source> Copy to clipboard </source>
         <target state="new">Copier dans le presse-papiers</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">23</context>
+          <context context-type="linenumber">36</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.affiliationSection.string" datatype="html">
-        <source>Affiliation Section</source>
+        <source> Affiliation Section </source>
         <target state="new">Type d&apos;affiliation</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">29</context>
+          <context context-type="linenumber">48</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2010,15 +2010,15 @@
         <target state="new">Organisation</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.departmentName.string" datatype="html">
-        <source>Department Name</source>
+        <source> Department Name </source>
         <target state="new">Service</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">68</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2026,11 +2026,11 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.roleTitle.string" datatype="html">
-        <source>Role Title</source>
+        <source> Role Title </source>
         <target state="new">Rôle/titre</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">42</context>
+          <context context-type="linenumber">78</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2042,7 +2042,7 @@
         <target state="new">URL</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">46</context>
+          <context context-type="linenumber">84</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2050,27 +2050,27 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.startDate.string" datatype="html">
-        <source>Start Date</source>
+        <source> Start Date </source>
         <target state="new">Date de début</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">50</context>
+          <context context-type="linenumber">92</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.endDate.string" datatype="html">
-        <source>End Date</source>
+        <source> End Date </source>
         <target state="new">Date de fin</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">54</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.externalId.string" datatype="html">
-        <source>External Id</source>
+        <source> External Id </source>
         <target state="new">Identifiant externe</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">58</context>
+          <context context-type="linenumber">108</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2082,23 +2082,23 @@
         <target state="new">Créé</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">116</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.addedToOrcid.string" datatype="html">
-        <source>Added To ORCID</source>
+        <source> Added To ORCID </source>
         <target state="new">Ajouté à ORCID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">66</context>
+          <context context-type="linenumber">124</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.updatedInOrcid.string" datatype="html">
-        <source>Updated In ORCID</source>
+        <source> Updated In ORCID </source>
         <target state="new">Mis à jour dans ORCID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">134</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.modified.string" datatype="html">
@@ -2106,7 +2106,7 @@
         <target state="new">Modifié</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">140</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.adminId.string" datatype="html">
@@ -2114,35 +2114,35 @@
         <target state="new">Identifiant de l&apos;administrateur</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">145</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.notificationFirstSent.string" datatype="html">
-        <source>Notification First Sent</source>
+        <source> Notification First Sent </source>
         <target state="new">Première notification envoyée</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">156</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">175</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.notificationLastSent.string" datatype="html">
-        <source>Notification Last Sent</source>
+        <source> Notification Last Sent </source>
         <target state="new">Dernière notification envoyée</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">90</context>
+          <context context-type="linenumber">194</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceaffiliation.notificationLastSent.string" datatype="html">
-        <source>Notification Last Sent</source>
-        <target state="new">Notification Last Sent</target>
+        <source> Notification Last Sent </source>
+        <target state="new"> Notification Last Sent </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">213</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.copySuccess.string" datatype="html">
@@ -2150,7 +2150,7 @@
         <target state="new">Copié dans le presse-papiers</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.ts</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">52</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.import.title.string" datatype="html">
diff --git a/ui/src/i18n/messages.it.xlf b/ui/src/i18n/messages.it.xlf
index bc7981569..e7243f495 100644
--- a/ui/src/i18n/messages.it.xlf
+++ b/ui/src/i18n/messages.it.xlf
@@ -1377,7 +1377,7 @@
         <target state="new">da</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">143</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/user-detail.component.html</context>
@@ -1405,7 +1405,7 @@
         <target state="new">Indietro</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">230</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/user-detail.component.html</context>
@@ -1417,7 +1417,7 @@
         <target state="new">Modifica</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">111</context>
+          <context context-type="linenumber">234</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
@@ -1564,7 +1564,7 @@
         <target state="new">Visualizzazione <x id="PH" equiv-text="first"></x> - <x id="PH_1" equiv-text="second"></x> di <x id="PH_2" equiv-text="this.totalItems"></x> elementi.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.ts</context>
-          <context context-type="linenumber">216</context>
+          <context context-type="linenumber">228</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/users.component.ts</context>
@@ -1787,11 +1787,11 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.orcidId.string" datatype="html">
-        <source>ORCID iD</source>
+        <source> ORCID iD </source>
         <target state="new">iD ORCID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">25</context>
+          <context context-type="linenumber">40</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
@@ -1828,23 +1828,23 @@
       </trans-unit>
       <trans-unit id="{{&apos;gatewayApp.AffiliationSection.&apos; + affiliation.affiliationSection + &apos;.string&apos;}}" datatype="html">
         <source>
-          <x id="INTERPOLATION" equiv-text="{{affiliation.affiliationSection}}"></x>
+          <x id="INTERPOLATION" equiv-text="{{ affiliation.affiliationSection }}"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION" equiv-text="{{affiliation.affiliationSection}}"></x>
+          <x id="INTERPOLATION" equiv-text="{{ affiliation.affiliationSection }}"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="linenumber">52</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
           <context context-type="linenumber">167</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="gatewayApp.assertionServiceaffiliation.dateRange.string" datatype="html">
+      <trans-unit id="gatewayApp.assertionServiceAssertion.dateRange.string" datatype="html">
         <source>to</source>
-        <target state="new">to</target>
+        <target state="new">fino a:</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
           <context context-type="linenumber">183</context>
@@ -1995,27 +1995,27 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.permissionLink.string" datatype="html">
-        <source>Permission link</source>
+        <source> Permission link </source>
         <target state="new">Link di permesso</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.copyClipboard.string" datatype="html">
-        <source>Copy to clipboard</source>
+        <source> Copy to clipboard </source>
         <target state="new">Copia negli appunti</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">23</context>
+          <context context-type="linenumber">36</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.affiliationSection.string" datatype="html">
-        <source>Affiliation Section</source>
+        <source> Affiliation Section </source>
         <target state="new">Tipo di affiliazione</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">29</context>
+          <context context-type="linenumber">48</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2027,15 +2027,15 @@
         <target state="new">Organizzazione</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.departmentName.string" datatype="html">
-        <source>Department Name</source>
+        <source> Department Name </source>
         <target state="new">Dipartimento</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">68</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2043,11 +2043,11 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.roleTitle.string" datatype="html">
-        <source>Role Title</source>
+        <source> Role Title </source>
         <target state="new">Ruolo/Titolo</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">42</context>
+          <context context-type="linenumber">78</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2059,7 +2059,7 @@
         <target state="new">URL</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">46</context>
+          <context context-type="linenumber">84</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2067,28 +2067,28 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.startDate.string" datatype="html">
-        <source>Start Date</source>
+        <source> Start Date </source>
         <target state="new">Data di inizio</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">50</context>
+          <context context-type="linenumber">92</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.endDate.string" datatype="html">
-        <source>End Date</source>
+        <source> End Date </source>
         <target state="new">Data di fine</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">54</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.externalId.string" datatype="html">
-        <source>External Id</source>
+        <source> External Id </source>
         <target state="new">ID esterno
 </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">58</context>
+          <context context-type="linenumber">108</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2100,24 +2100,24 @@
         <target state="new">Creato</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">116</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.addedToOrcid.string" datatype="html">
-        <source>Added To ORCID</source>
+        <source> Added To ORCID </source>
         <target state="new">Aggiunto a ORCID
 </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">66</context>
+          <context context-type="linenumber">124</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.updatedInOrcid.string" datatype="html">
-        <source>Updated In ORCID</source>
+        <source> Updated In ORCID </source>
         <target state="new">Aggiornato in ORCID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">134</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.modified.string" datatype="html">
@@ -2125,7 +2125,7 @@
         <target state="new">Modificato</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">140</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.adminId.string" datatype="html">
@@ -2133,35 +2133,35 @@
         <target state="new">ID amministratore</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">145</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.notificationFirstSent.string" datatype="html">
-        <source>Notification First Sent</source>
+        <source> Notification First Sent </source>
         <target state="new">Prima notifica inviata</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">156</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">175</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.notificationLastSent.string" datatype="html">
-        <source>Notification Last Sent</source>
+        <source> Notification Last Sent </source>
         <target state="new">Ultima notifica inviata</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">90</context>
+          <context context-type="linenumber">194</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceaffiliation.notificationLastSent.string" datatype="html">
-        <source>Notification Last Sent</source>
-        <target state="new">Notification Last Sent</target>
+        <source> Notification Last Sent </source>
+        <target state="new"> Notification Last Sent </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">213</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.copySuccess.string" datatype="html">
@@ -2169,7 +2169,7 @@
         <target state="new">Copiato negli appunti</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.ts</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">52</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.import.title.string" datatype="html">
diff --git a/ui/src/i18n/messages.ja.xlf b/ui/src/i18n/messages.ja.xlf
index 8e69338dd..dd5754af5 100644
--- a/ui/src/i18n/messages.ja.xlf
+++ b/ui/src/i18n/messages.ja.xlf
@@ -1364,7 +1364,7 @@
         <target state="new">による</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">143</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/user-detail.component.html</context>
@@ -1392,7 +1392,7 @@
         <target state="new">戻る</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">230</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/user-detail.component.html</context>
@@ -1404,7 +1404,7 @@
         <target state="new">編集</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">111</context>
+          <context context-type="linenumber">234</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
@@ -1548,7 +1548,7 @@
         <target state="new"><x id="PH_2" equiv-text="this.totalItems"></x>アイテムの<x id="PH" equiv-text="first"></x> - <x id="PH_1" equiv-text="second"></x>を表示しています。</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.ts</context>
-          <context context-type="linenumber">216</context>
+          <context context-type="linenumber">228</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/users.component.ts</context>
@@ -1769,11 +1769,11 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.orcidId.string" datatype="html">
-        <source>ORCID iD</source>
+        <source> ORCID iD </source>
         <target state="new">ORCID iD</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">25</context>
+          <context context-type="linenumber">40</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
@@ -1810,23 +1810,23 @@
       </trans-unit>
       <trans-unit id="{{&apos;gatewayApp.AffiliationSection.&apos; + affiliation.affiliationSection + &apos;.string&apos;}}" datatype="html">
         <source>
-          <x id="INTERPOLATION" equiv-text="{{affiliation.affiliationSection}}"></x>
+          <x id="INTERPOLATION" equiv-text="{{ affiliation.affiliationSection }}"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION" equiv-text="{{affiliation.affiliationSection}}"></x>
+          <x id="INTERPOLATION" equiv-text="{{ affiliation.affiliationSection }}"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="linenumber">52</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
           <context context-type="linenumber">167</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="gatewayApp.assertionServiceaffiliation.dateRange.string" datatype="html">
+      <trans-unit id="gatewayApp.assertionServiceAssertion.dateRange.string" datatype="html">
         <source>to</source>
-        <target state="new">to</target>
+        <target state="new">:</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
           <context context-type="linenumber">183</context>
@@ -1977,27 +1977,27 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.permissionLink.string" datatype="html">
-        <source>Permission link</source>
+        <source> Permission link </source>
         <target state="new">パーミッションリンク：</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.copyClipboard.string" datatype="html">
-        <source>Copy to clipboard</source>
+        <source> Copy to clipboard </source>
         <target state="new">クリップボードにコピー</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">23</context>
+          <context context-type="linenumber">36</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.affiliationSection.string" datatype="html">
-        <source>Affiliation Section</source>
+        <source> Affiliation Section </source>
         <target state="new">アフィリエーションタイプ</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">29</context>
+          <context context-type="linenumber">48</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2009,15 +2009,15 @@
         <target state="new">組織</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.departmentName.string" datatype="html">
-        <source>Department Name</source>
+        <source> Department Name </source>
         <target state="new">部</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">68</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2025,11 +2025,11 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.roleTitle.string" datatype="html">
-        <source>Role Title</source>
+        <source> Role Title </source>
         <target state="new">役割 / 役職</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">42</context>
+          <context context-type="linenumber">78</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2041,7 +2041,7 @@
         <target state="new">URL</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">46</context>
+          <context context-type="linenumber">84</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2049,27 +2049,27 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.startDate.string" datatype="html">
-        <source>Start Date</source>
+        <source> Start Date </source>
         <target state="new">開始日付</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">50</context>
+          <context context-type="linenumber">92</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.endDate.string" datatype="html">
-        <source>End Date</source>
+        <source> End Date </source>
         <target state="new">終了日付</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">54</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.externalId.string" datatype="html">
-        <source>External Id</source>
+        <source> External Id </source>
         <target state="new">外部ID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">58</context>
+          <context context-type="linenumber">108</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2081,23 +2081,23 @@
         <target state="new">作成されました</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">116</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.addedToOrcid.string" datatype="html">
-        <source>Added To ORCID</source>
+        <source> Added To ORCID </source>
         <target state="new">ORCIDに追加されました</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">66</context>
+          <context context-type="linenumber">124</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.updatedInOrcid.string" datatype="html">
-        <source>Updated In ORCID</source>
+        <source> Updated In ORCID </source>
         <target state="new">ORCID で更新されました</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">134</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.modified.string" datatype="html">
@@ -2105,7 +2105,7 @@
         <target state="new">変更しました</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">140</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.adminId.string" datatype="html">
@@ -2113,35 +2113,35 @@
         <target state="new">管理者ID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">145</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.notificationFirstSent.string" datatype="html">
-        <source>Notification First Sent</source>
+        <source> Notification First Sent </source>
         <target state="new">初回通知を送信しました</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">156</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">175</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.notificationLastSent.string" datatype="html">
-        <source>Notification Last Sent</source>
+        <source> Notification Last Sent </source>
         <target state="new">最終送信通知</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">90</context>
+          <context context-type="linenumber">194</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceaffiliation.notificationLastSent.string" datatype="html">
-        <source>Notification Last Sent</source>
-        <target state="new">Notification Last Sent</target>
+        <source> Notification Last Sent </source>
+        <target state="new"> Notification Last Sent </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">213</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.copySuccess.string" datatype="html">
@@ -2149,7 +2149,7 @@
         <target state="new">クリップボードにコピーされました</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.ts</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">52</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.import.title.string" datatype="html">
diff --git a/ui/src/i18n/messages.ko.xlf b/ui/src/i18n/messages.ko.xlf
index a6aa5ce0c..7f5ae9eb4 100644
--- a/ui/src/i18n/messages.ko.xlf
+++ b/ui/src/i18n/messages.ko.xlf
@@ -1363,7 +1363,7 @@
         <target state="new">다음에 의함:</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">143</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/user-detail.component.html</context>
@@ -1391,7 +1391,7 @@
         <target state="new">뒤로</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">230</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/user-detail.component.html</context>
@@ -1403,7 +1403,7 @@
         <target state="new">편집</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">111</context>
+          <context context-type="linenumber">234</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
@@ -1547,7 +1547,7 @@
         <target state="new"><x id="PH_2" equiv-text="this.totalItems"></x> 항목 중 <x id="PH" equiv-text="first"></x> - <x id="PH_1" equiv-text="second"></x> 항목 표시.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.ts</context>
-          <context context-type="linenumber">216</context>
+          <context context-type="linenumber">228</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/users.component.ts</context>
@@ -1768,11 +1768,11 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.orcidId.string" datatype="html">
-        <source>ORCID iD</source>
+        <source> ORCID iD </source>
         <target state="new">ORCID ID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">25</context>
+          <context context-type="linenumber">40</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
@@ -1809,23 +1809,23 @@
       </trans-unit>
       <trans-unit id="{{&apos;gatewayApp.AffiliationSection.&apos; + affiliation.affiliationSection + &apos;.string&apos;}}" datatype="html">
         <source>
-          <x id="INTERPOLATION" equiv-text="{{affiliation.affiliationSection}}"></x>
+          <x id="INTERPOLATION" equiv-text="{{ affiliation.affiliationSection }}"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION" equiv-text="{{affiliation.affiliationSection}}"></x>
+          <x id="INTERPOLATION" equiv-text="{{ affiliation.affiliationSection }}"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="linenumber">52</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
           <context context-type="linenumber">167</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="gatewayApp.assertionServiceaffiliation.dateRange.string" datatype="html">
+      <trans-unit id="gatewayApp.assertionServiceAssertion.dateRange.string" datatype="html">
         <source>to</source>
-        <target state="new">to</target>
+        <target state="new">~</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
           <context context-type="linenumber">183</context>
@@ -1976,27 +1976,27 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.permissionLink.string" datatype="html">
-        <source>Permission link</source>
+        <source> Permission link </source>
         <target state="new">권한 링크</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.copyClipboard.string" datatype="html">
-        <source>Copy to clipboard</source>
+        <source> Copy to clipboard </source>
         <target state="new">클립 보드에 복사</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">23</context>
+          <context context-type="linenumber">36</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.affiliationSection.string" datatype="html">
-        <source>Affiliation Section</source>
+        <source> Affiliation Section </source>
         <target state="new">제휴 유형</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">29</context>
+          <context context-type="linenumber">48</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2008,15 +2008,15 @@
         <target state="new">조직</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.departmentName.string" datatype="html">
-        <source>Department Name</source>
+        <source> Department Name </source>
         <target state="new">부서</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">68</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2024,11 +2024,11 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.roleTitle.string" datatype="html">
-        <source>Role Title</source>
+        <source> Role Title </source>
         <target state="new">역할/직책</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">42</context>
+          <context context-type="linenumber">78</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2040,7 +2040,7 @@
         <target state="new">URL</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">46</context>
+          <context context-type="linenumber">84</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2048,27 +2048,27 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.startDate.string" datatype="html">
-        <source>Start Date</source>
+        <source> Start Date </source>
         <target state="new">시작 날짜</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">50</context>
+          <context context-type="linenumber">92</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.endDate.string" datatype="html">
-        <source>End Date</source>
+        <source> End Date </source>
         <target state="new">종료 날짜</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">54</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.externalId.string" datatype="html">
-        <source>External Id</source>
+        <source> External Id </source>
         <target state="new">외부 ID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">58</context>
+          <context context-type="linenumber">108</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2080,23 +2080,23 @@
         <target state="new">생성됨</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">116</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.addedToOrcid.string" datatype="html">
-        <source>Added To ORCID</source>
+        <source> Added To ORCID </source>
         <target state="new">ORCID에 추가됨</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">66</context>
+          <context context-type="linenumber">124</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.updatedInOrcid.string" datatype="html">
-        <source>Updated In ORCID</source>
+        <source> Updated In ORCID </source>
         <target state="new">ORCID에서 업데이트됨</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">134</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.modified.string" datatype="html">
@@ -2104,7 +2104,7 @@
         <target state="new">수정됨</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">140</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.adminId.string" datatype="html">
@@ -2112,35 +2112,35 @@
         <target state="new">관리자 ID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">145</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.notificationFirstSent.string" datatype="html">
-        <source>Notification First Sent</source>
+        <source> Notification First Sent </source>
         <target state="new">알림 처음 전송됨</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">156</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">175</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.notificationLastSent.string" datatype="html">
-        <source>Notification Last Sent</source>
+        <source> Notification Last Sent </source>
         <target state="new">알림 마지막으로 전송됨</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">90</context>
+          <context context-type="linenumber">194</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceaffiliation.notificationLastSent.string" datatype="html">
-        <source>Notification Last Sent</source>
-        <target state="new">Notification Last Sent</target>
+        <source> Notification Last Sent </source>
+        <target state="new"> Notification Last Sent </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">213</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.copySuccess.string" datatype="html">
@@ -2148,7 +2148,7 @@
         <target state="new">클립보드에 복사됨</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.ts</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">52</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.import.title.string" datatype="html">
diff --git a/ui/src/i18n/messages.pt.xlf b/ui/src/i18n/messages.pt.xlf
index 96b14270f..8c4a83dfb 100644
--- a/ui/src/i18n/messages.pt.xlf
+++ b/ui/src/i18n/messages.pt.xlf
@@ -1364,7 +1364,7 @@
         <target state="new">por</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">143</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/user-detail.component.html</context>
@@ -1392,7 +1392,7 @@
         <target state="new">Voltar</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">230</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/user-detail.component.html</context>
@@ -1404,7 +1404,7 @@
         <target state="new">Editar</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">111</context>
+          <context context-type="linenumber">234</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
@@ -1548,7 +1548,7 @@
         <target state="new">A mostrar <x id="PH" equiv-text="first"></x> - <x id="PH_1" equiv-text="second"></x> de <x id="PH_2" equiv-text="this.totalItems"></x> itens.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.ts</context>
-          <context context-type="linenumber">216</context>
+          <context context-type="linenumber">228</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/users.component.ts</context>
@@ -1769,11 +1769,11 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.orcidId.string" datatype="html">
-        <source>ORCID iD</source>
+        <source> ORCID iD </source>
         <target state="new">iD do ORCID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">25</context>
+          <context context-type="linenumber">40</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
@@ -1810,23 +1810,23 @@
       </trans-unit>
       <trans-unit id="{{&apos;gatewayApp.AffiliationSection.&apos; + affiliation.affiliationSection + &apos;.string&apos;}}" datatype="html">
         <source>
-          <x id="INTERPOLATION" equiv-text="{{affiliation.affiliationSection}}"></x>
+          <x id="INTERPOLATION" equiv-text="{{ affiliation.affiliationSection }}"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION" equiv-text="{{affiliation.affiliationSection}}"></x>
+          <x id="INTERPOLATION" equiv-text="{{ affiliation.affiliationSection }}"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="linenumber">52</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
           <context context-type="linenumber">167</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="gatewayApp.assertionServiceaffiliation.dateRange.string" datatype="html">
+      <trans-unit id="gatewayApp.assertionServiceAssertion.dateRange.string" datatype="html">
         <source>to</source>
-        <target state="new">to</target>
+        <target state="new">até</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
           <context context-type="linenumber">183</context>
@@ -1977,27 +1977,27 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.permissionLink.string" datatype="html">
-        <source>Permission link</source>
+        <source> Permission link </source>
         <target state="new">Hiperligação de Permissão</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.copyClipboard.string" datatype="html">
-        <source>Copy to clipboard</source>
+        <source> Copy to clipboard </source>
         <target state="new">Copiar para a área de transferência</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">23</context>
+          <context context-type="linenumber">36</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.affiliationSection.string" datatype="html">
-        <source>Affiliation Section</source>
+        <source> Affiliation Section </source>
         <target state="new">Tipo de Afiliação</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">29</context>
+          <context context-type="linenumber">48</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2009,15 +2009,15 @@
         <target state="new">Organização</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.departmentName.string" datatype="html">
-        <source>Department Name</source>
+        <source> Department Name </source>
         <target state="new">Departamento</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">68</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2025,11 +2025,11 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.roleTitle.string" datatype="html">
-        <source>Role Title</source>
+        <source> Role Title </source>
         <target state="new">Papel/Título</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">42</context>
+          <context context-type="linenumber">78</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2041,7 +2041,7 @@
         <target state="new">URL</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">46</context>
+          <context context-type="linenumber">84</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2049,27 +2049,27 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.startDate.string" datatype="html">
-        <source>Start Date</source>
+        <source> Start Date </source>
         <target state="new">Data de Início</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">50</context>
+          <context context-type="linenumber">92</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.endDate.string" datatype="html">
-        <source>End Date</source>
+        <source> End Date </source>
         <target state="new">Data de Fim</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">54</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.externalId.string" datatype="html">
-        <source>External Id</source>
+        <source> External Id </source>
         <target state="new">ID Externo</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">58</context>
+          <context context-type="linenumber">108</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2081,23 +2081,23 @@
         <target state="new">Criado</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">116</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.addedToOrcid.string" datatype="html">
-        <source>Added To ORCID</source>
+        <source> Added To ORCID </source>
         <target state="new">Adicionado ao ORCID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">66</context>
+          <context context-type="linenumber">124</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.updatedInOrcid.string" datatype="html">
-        <source>Updated In ORCID</source>
+        <source> Updated In ORCID </source>
         <target state="new">Atualizado no ORCID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">134</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.modified.string" datatype="html">
@@ -2105,7 +2105,7 @@
         <target state="new">Modificado</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">140</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.adminId.string" datatype="html">
@@ -2113,35 +2113,35 @@
         <target state="new">ID do administrador</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">145</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.notificationFirstSent.string" datatype="html">
-        <source>Notification First Sent</source>
+        <source> Notification First Sent </source>
         <target state="new">Primeira notificação enviada</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">156</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">175</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.notificationLastSent.string" datatype="html">
-        <source>Notification Last Sent</source>
+        <source> Notification Last Sent </source>
         <target state="new">Última notificação enviada</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">90</context>
+          <context context-type="linenumber">194</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceaffiliation.notificationLastSent.string" datatype="html">
-        <source>Notification Last Sent</source>
-        <target state="new">Notification Last Sent</target>
+        <source> Notification Last Sent </source>
+        <target state="new"> Notification Last Sent </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">213</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.copySuccess.string" datatype="html">
@@ -2149,7 +2149,7 @@
         <target state="new">Copiado para a área de transferência</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.ts</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">52</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.import.title.string" datatype="html">
diff --git a/ui/src/i18n/messages.ru.xlf b/ui/src/i18n/messages.ru.xlf
index 26e8c8f66..9870f23e9 100644
--- a/ui/src/i18n/messages.ru.xlf
+++ b/ui/src/i18n/messages.ru.xlf
@@ -1363,7 +1363,7 @@
         <target state="new">кем</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">143</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/user-detail.component.html</context>
@@ -1391,7 +1391,7 @@
         <target state="new">Назад</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">230</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/user-detail.component.html</context>
@@ -1403,7 +1403,7 @@
         <target state="new">Редактировать</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">111</context>
+          <context context-type="linenumber">234</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
@@ -1547,7 +1547,7 @@
         <target state="new">Показаны <x id="PH" equiv-text="first"></x> - <x id="PH_1" equiv-text="second"></x> из <x id="PH_2" equiv-text="this.totalItems"></x> элементов.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.ts</context>
-          <context context-type="linenumber">216</context>
+          <context context-type="linenumber">228</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/users.component.ts</context>
@@ -1768,11 +1768,11 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.orcidId.string" datatype="html">
-        <source>ORCID iD</source>
+        <source> ORCID iD </source>
         <target state="new">Идентификатор ORCID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">25</context>
+          <context context-type="linenumber">40</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
@@ -1809,23 +1809,23 @@
       </trans-unit>
       <trans-unit id="{{&apos;gatewayApp.AffiliationSection.&apos; + affiliation.affiliationSection + &apos;.string&apos;}}" datatype="html">
         <source>
-          <x id="INTERPOLATION" equiv-text="{{affiliation.affiliationSection}}"></x>
+          <x id="INTERPOLATION" equiv-text="{{ affiliation.affiliationSection }}"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION" equiv-text="{{affiliation.affiliationSection}}"></x>
+          <x id="INTERPOLATION" equiv-text="{{ affiliation.affiliationSection }}"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="linenumber">52</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
           <context context-type="linenumber">167</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="gatewayApp.assertionServiceaffiliation.dateRange.string" datatype="html">
+      <trans-unit id="gatewayApp.assertionServiceAssertion.dateRange.string" datatype="html">
         <source>to</source>
-        <target state="new">to</target>
+        <target state="new">по</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
           <context context-type="linenumber">183</context>
@@ -1976,27 +1976,27 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.permissionLink.string" datatype="html">
-        <source>Permission link</source>
+        <source> Permission link </source>
         <target state="new">Ссылка на разрешение</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.copyClipboard.string" datatype="html">
-        <source>Copy to clipboard</source>
+        <source> Copy to clipboard </source>
         <target state="new">Копировать в буфер обмена</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">23</context>
+          <context context-type="linenumber">36</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.affiliationSection.string" datatype="html">
-        <source>Affiliation Section</source>
+        <source> Affiliation Section </source>
         <target state="new">Тип принадлежности</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">29</context>
+          <context context-type="linenumber">48</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2008,15 +2008,15 @@
         <target state="new">Организация</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.departmentName.string" datatype="html">
-        <source>Department Name</source>
+        <source> Department Name </source>
         <target state="new">Отдел</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">68</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2024,11 +2024,11 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.roleTitle.string" datatype="html">
-        <source>Role Title</source>
+        <source> Role Title </source>
         <target state="new">Роль/форма обращения</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">42</context>
+          <context context-type="linenumber">78</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2040,7 +2040,7 @@
         <target state="new">URL-адрес</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">46</context>
+          <context context-type="linenumber">84</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2048,27 +2048,27 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.startDate.string" datatype="html">
-        <source>Start Date</source>
+        <source> Start Date </source>
         <target state="new">Дата начала</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">50</context>
+          <context context-type="linenumber">92</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.endDate.string" datatype="html">
-        <source>End Date</source>
+        <source> End Date </source>
         <target state="new">Дата окончания</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">54</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.externalId.string" datatype="html">
-        <source>External Id</source>
+        <source> External Id </source>
         <target state="new">Внешний идентификатор</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">58</context>
+          <context context-type="linenumber">108</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2080,23 +2080,23 @@
         <target state="new">Создано</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">116</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.addedToOrcid.string" datatype="html">
-        <source>Added To ORCID</source>
+        <source> Added To ORCID </source>
         <target state="new">Добавлено в ORCID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">66</context>
+          <context context-type="linenumber">124</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.updatedInOrcid.string" datatype="html">
-        <source>Updated In ORCID</source>
+        <source> Updated In ORCID </source>
         <target state="new">Обновлено в ORCID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">134</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.modified.string" datatype="html">
@@ -2104,7 +2104,7 @@
         <target state="new">Изменено</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">140</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.adminId.string" datatype="html">
@@ -2112,35 +2112,35 @@
         <target state="new">Идентификатор администратора</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">145</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.notificationFirstSent.string" datatype="html">
-        <source>Notification First Sent</source>
+        <source> Notification First Sent </source>
         <target state="new">Первое отправленное уведомление</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">156</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">175</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.notificationLastSent.string" datatype="html">
-        <source>Notification Last Sent</source>
+        <source> Notification Last Sent </source>
         <target state="new">Последнее отправленное уведомление</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">90</context>
+          <context context-type="linenumber">194</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceaffiliation.notificationLastSent.string" datatype="html">
-        <source>Notification Last Sent</source>
-        <target state="new">Notification Last Sent</target>
+        <source> Notification Last Sent </source>
+        <target state="new"> Notification Last Sent </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">213</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.copySuccess.string" datatype="html">
@@ -2148,7 +2148,7 @@
         <target state="new">Скопировано в буфер обмена</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.ts</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">52</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.import.title.string" datatype="html">
diff --git a/ui/src/i18n/messages.xlf b/ui/src/i18n/messages.xlf
index c95bfaf33..4c76b53b8 100644
--- a/ui/src/i18n/messages.xlf
+++ b/ui/src/i18n/messages.xlf
@@ -1064,7 +1064,7 @@
         <source> Back</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">230</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/user-detail.component.html</context>
@@ -1113,7 +1113,7 @@
         <source> Edit</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">111</context>
+          <context context-type="linenumber">234</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
@@ -1322,7 +1322,7 @@
         <source>by</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">143</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/user-detail.component.html</context>
@@ -1363,7 +1363,7 @@
         <source>Showing <x id="PH" equiv-text="first"/> - <x id="PH_1" equiv-text="second"/> of <x id="PH_2" equiv-text="this.totalItems"/> items.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.ts</context>
-          <context context-type="linenumber">216</context>
+          <context context-type="linenumber">228</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/users.component.ts</context>
@@ -1476,18 +1476,18 @@
       </trans-unit>
       <trans-unit id="{{&apos;gatewayApp.AffiliationSection.&apos; + affiliation.affiliationSection + &apos;.string&apos;}}" datatype="html">
         <source>
-          <x id="INTERPOLATION" equiv-text="{{affiliation.affiliationSection}}"/>
+          <x id="INTERPOLATION" equiv-text="{{ affiliation.affiliationSection }}"/>
         </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="linenumber">52</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
           <context context-type="linenumber">167</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="gatewayApp.assertionServiceaffiliation.dateRange.string" datatype="html">
+      <trans-unit id="gatewayApp.assertionServiceAssertion.dateRange.string" datatype="html">
         <source>to</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
@@ -1581,10 +1581,10 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.orcidId.string" datatype="html">
-        <source>ORCID iD</source>
+        <source> ORCID iD </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">25</context>
+          <context context-type="linenumber">40</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
@@ -3549,31 +3549,31 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceaffiliation.notificationLastSent.string" datatype="html">
-        <source>Notification Last Sent</source>
+        <source> Notification Last Sent </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">213</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.addedToOrcid.string" datatype="html">
-        <source>Added To ORCID</source>
+        <source> Added To ORCID </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">66</context>
+          <context context-type="linenumber">124</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.adminId.string" datatype="html">
         <source>Admin Id</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">145</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.affiliationSection.string" datatype="html">
-        <source>Affiliation Section</source>
+        <source> Affiliation Section </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">29</context>
+          <context context-type="linenumber">48</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -3581,31 +3581,31 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.copyClipboard.string" datatype="html">
-        <source>Copy to clipboard</source>
+        <source> Copy to clipboard </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">23</context>
+          <context context-type="linenumber">36</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.copySuccess.string" datatype="html">
         <source>Copied to clipboard</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.ts</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">52</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.created.string" datatype="html">
         <source>Created</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">116</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.departmentName.string" datatype="html">
-        <source>Department Name</source>
+        <source> Department Name </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">68</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -3616,7 +3616,7 @@
         <source>Organization</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.detail.title.string" datatype="html">
@@ -3627,17 +3627,17 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.endDate.string" datatype="html">
-        <source>End Date</source>
+        <source> End Date </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">54</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.externalId.string" datatype="html">
-        <source>External Id</source>
+        <source> External Id </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">58</context>
+          <context context-type="linenumber">108</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -3690,39 +3690,39 @@
         <source>Modified</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">140</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.notificationFirstSent.string" datatype="html">
-        <source>Notification First Sent</source>
+        <source> Notification First Sent </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">156</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">175</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.notificationLastSent.string" datatype="html">
-        <source>Notification Last Sent</source>
+        <source> Notification Last Sent </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">90</context>
+          <context context-type="linenumber">194</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.permissionLink.string" datatype="html">
-        <source>Permission link</source>
+        <source> Permission link </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.roleTitle.string" datatype="html">
-        <source>Role Title</source>
+        <source> Role Title </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">42</context>
+          <context context-type="linenumber">78</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -3730,17 +3730,17 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.startDate.string" datatype="html">
-        <source>Start Date</source>
+        <source> Start Date </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">50</context>
+          <context context-type="linenumber">92</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.updatedInOrcid.string" datatype="html">
-        <source>Updated In ORCID</source>
+        <source> Updated In ORCID </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">134</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.uploadNote.string" datatype="html">
@@ -3754,7 +3754,7 @@
         <source>Url</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">46</context>
+          <context context-type="linenumber">84</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
diff --git a/ui/src/i18n/messages.zh-CN.xlf b/ui/src/i18n/messages.zh-CN.xlf
index 5b78a1475..5f09ffca2 100644
--- a/ui/src/i18n/messages.zh-CN.xlf
+++ b/ui/src/i18n/messages.zh-CN.xlf
@@ -1363,7 +1363,7 @@
         <target state="new">方式</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">143</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/user-detail.component.html</context>
@@ -1391,7 +1391,7 @@
         <target state="new">返回</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">230</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/user-detail.component.html</context>
@@ -1403,7 +1403,7 @@
         <target state="new">编辑</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">111</context>
+          <context context-type="linenumber">234</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
@@ -1547,7 +1547,7 @@
         <target state="new">当前显示第 <x id="PH" equiv-text="first"></x> - <x id="PH_1" equiv-text="second"></x> 个项目，共计 <x id="PH_2" equiv-text="this.totalItems"></x> 个项目。</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.ts</context>
-          <context context-type="linenumber">216</context>
+          <context context-type="linenumber">228</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/users.component.ts</context>
@@ -1768,11 +1768,11 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.orcidId.string" datatype="html">
-        <source>ORCID iD</source>
+        <source> ORCID iD </source>
         <target state="new">ORCID iD</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">25</context>
+          <context context-type="linenumber">40</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
@@ -1809,23 +1809,23 @@
       </trans-unit>
       <trans-unit id="{{&apos;gatewayApp.AffiliationSection.&apos; + affiliation.affiliationSection + &apos;.string&apos;}}" datatype="html">
         <source>
-          <x id="INTERPOLATION" equiv-text="{{affiliation.affiliationSection}}"></x>
+          <x id="INTERPOLATION" equiv-text="{{ affiliation.affiliationSection }}"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION" equiv-text="{{affiliation.affiliationSection}}"></x>
+          <x id="INTERPOLATION" equiv-text="{{ affiliation.affiliationSection }}"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="linenumber">52</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
           <context context-type="linenumber">167</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="gatewayApp.assertionServiceaffiliation.dateRange.string" datatype="html">
+      <trans-unit id="gatewayApp.assertionServiceAssertion.dateRange.string" datatype="html">
         <source>to</source>
-        <target state="new">to</target>
+        <target state="new">至</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
           <context context-type="linenumber">183</context>
@@ -1976,27 +1976,27 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.permissionLink.string" datatype="html">
-        <source>Permission link</source>
+        <source> Permission link </source>
         <target state="new">权限链接</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.copyClipboard.string" datatype="html">
-        <source>Copy to clipboard</source>
+        <source> Copy to clipboard </source>
         <target state="new">复制到剪贴板</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">23</context>
+          <context context-type="linenumber">36</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.affiliationSection.string" datatype="html">
-        <source>Affiliation Section</source>
+        <source> Affiliation Section </source>
         <target state="new">机构类型</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">29</context>
+          <context context-type="linenumber">48</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2008,15 +2008,15 @@
         <target state="new">组织</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.departmentName.string" datatype="html">
-        <source>Department Name</source>
+        <source> Department Name </source>
         <target state="new">部门</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">68</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2024,11 +2024,11 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.roleTitle.string" datatype="html">
-        <source>Role Title</source>
+        <source> Role Title </source>
         <target state="new">角色/职位</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">42</context>
+          <context context-type="linenumber">78</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2040,7 +2040,7 @@
         <target state="new">URL</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">46</context>
+          <context context-type="linenumber">84</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2048,27 +2048,27 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.startDate.string" datatype="html">
-        <source>Start Date</source>
+        <source> Start Date </source>
         <target state="new">开始日期</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">50</context>
+          <context context-type="linenumber">92</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.endDate.string" datatype="html">
-        <source>End Date</source>
+        <source> End Date </source>
         <target state="new">结束日期</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">54</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.externalId.string" datatype="html">
-        <source>External Id</source>
+        <source> External Id </source>
         <target state="new">外部 ID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">58</context>
+          <context context-type="linenumber">108</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2080,23 +2080,23 @@
         <target state="new">已创建</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">116</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.addedToOrcid.string" datatype="html">
-        <source>Added To ORCID</source>
+        <source> Added To ORCID </source>
         <target state="new">已添加至 ORCID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">66</context>
+          <context context-type="linenumber">124</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.updatedInOrcid.string" datatype="html">
-        <source>Updated In ORCID</source>
+        <source> Updated In ORCID </source>
         <target state="new">已在 ORCID 中更新</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">134</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.modified.string" datatype="html">
@@ -2104,7 +2104,7 @@
         <target state="new">已修改</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">140</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.adminId.string" datatype="html">
@@ -2112,35 +2112,35 @@
         <target state="new">Admin ID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">145</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.notificationFirstSent.string" datatype="html">
-        <source>Notification First Sent</source>
+        <source> Notification First Sent </source>
         <target state="new">首次发送的通知</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">156</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">175</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.notificationLastSent.string" datatype="html">
-        <source>Notification Last Sent</source>
+        <source> Notification Last Sent </source>
         <target state="new">最后发送的通知</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">90</context>
+          <context context-type="linenumber">194</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceaffiliation.notificationLastSent.string" datatype="html">
-        <source>Notification Last Sent</source>
-        <target state="new">Notification Last Sent</target>
+        <source> Notification Last Sent </source>
+        <target state="new"> Notification Last Sent </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">213</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.copySuccess.string" datatype="html">
@@ -2148,7 +2148,7 @@
         <target state="new">已复制到剪贴板</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.ts</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">52</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.import.title.string" datatype="html">
diff --git a/ui/src/i18n/messages.zh-TW.xlf b/ui/src/i18n/messages.zh-TW.xlf
index ad3d55079..996dd056d 100644
--- a/ui/src/i18n/messages.zh-TW.xlf
+++ b/ui/src/i18n/messages.zh-TW.xlf
@@ -1363,7 +1363,7 @@
         <target state="new">由</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">143</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/user-detail.component.html</context>
@@ -1391,7 +1391,7 @@
         <target state="new">回去</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">230</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/user-detail.component.html</context>
@@ -1403,7 +1403,7 @@
         <target state="new">編輯</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">111</context>
+          <context context-type="linenumber">234</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
@@ -1547,7 +1547,7 @@
         <target state="new">顯示 <x id="PH_2" equiv-text="this.totalItems"></x> 項物件中的 <x id="PH" equiv-text="first"></x> - <x id="PH_1" equiv-text="second"></x> 項。</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.ts</context>
-          <context context-type="linenumber">216</context>
+          <context context-type="linenumber">228</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/user/users.component.ts</context>
@@ -1768,11 +1768,11 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.orcidId.string" datatype="html">
-        <source>ORCID iD</source>
+        <source> ORCID iD </source>
         <target state="new">ORCID 編碼</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">25</context>
+          <context context-type="linenumber">40</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
@@ -1809,23 +1809,23 @@
       </trans-unit>
       <trans-unit id="{{&apos;gatewayApp.AffiliationSection.&apos; + affiliation.affiliationSection + &apos;.string&apos;}}" datatype="html">
         <source>
-          <x id="INTERPOLATION" equiv-text="{{affiliation.affiliationSection}}"></x>
+          <x id="INTERPOLATION" equiv-text="{{ affiliation.affiliationSection }}"></x>
         </source>
         <target state="new">
-          <x id="INTERPOLATION" equiv-text="{{affiliation.affiliationSection}}"></x>
+          <x id="INTERPOLATION" equiv-text="{{ affiliation.affiliationSection }}"></x>
         </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="linenumber">52</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
           <context context-type="linenumber">167</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="gatewayApp.assertionServiceaffiliation.dateRange.string" datatype="html">
+      <trans-unit id="gatewayApp.assertionServiceAssertion.dateRange.string" datatype="html">
         <source>to</source>
-        <target state="new">to</target>
+        <target state="new">至</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliations.component.html</context>
           <context context-type="linenumber">183</context>
@@ -1976,27 +1976,27 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.permissionLink.string" datatype="html">
-        <source>Permission link</source>
+        <source> Permission link </source>
         <target state="new">許可連結</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.copyClipboard.string" datatype="html">
-        <source>Copy to clipboard</source>
+        <source> Copy to clipboard </source>
         <target state="new">已複製到剪貼簿</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">23</context>
+          <context context-type="linenumber">36</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.affiliationSection.string" datatype="html">
-        <source>Affiliation Section</source>
+        <source> Affiliation Section </source>
         <target state="new">機關類別</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">29</context>
+          <context context-type="linenumber">48</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2008,15 +2008,15 @@
         <target state="new">組織</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.departmentName.string" datatype="html">
-        <source>Department Name</source>
+        <source> Department Name </source>
         <target state="new">系所</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">68</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2024,11 +2024,11 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.roleTitle.string" datatype="html">
-        <source>Role Title</source>
+        <source> Role Title </source>
         <target state="new">角色／職稱</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">42</context>
+          <context context-type="linenumber">78</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2040,7 +2040,7 @@
         <target state="new">網址</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">46</context>
+          <context context-type="linenumber">84</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2048,27 +2048,27 @@
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.startDate.string" datatype="html">
-        <source>Start Date</source>
+        <source> Start Date </source>
         <target state="new">開始日期</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">50</context>
+          <context context-type="linenumber">92</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.endDate.string" datatype="html">
-        <source>End Date</source>
+        <source> End Date </source>
         <target state="new">結束日期</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">54</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.externalId.string" datatype="html">
-        <source>External Id</source>
+        <source> External Id </source>
         <target state="new">外部編碼</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">58</context>
+          <context context-type="linenumber">108</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-update.component.html</context>
@@ -2080,23 +2080,23 @@
         <target state="new">已創建</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">116</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.addedToOrcid.string" datatype="html">
-        <source>Added To ORCID</source>
+        <source> Added To ORCID </source>
         <target state="new">已新增至 ORCID</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">66</context>
+          <context context-type="linenumber">124</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.updatedInOrcid.string" datatype="html">
-        <source>Updated In ORCID</source>
+        <source> Updated In ORCID </source>
         <target state="new">已於 ORCID 中更新</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">134</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.modified.string" datatype="html">
@@ -2104,7 +2104,7 @@
         <target state="new">已修改</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">140</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.adminId.string" datatype="html">
@@ -2112,35 +2112,35 @@
         <target state="new">管理者編碼</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">145</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.notificationFirstSent.string" datatype="html">
-        <source>Notification First Sent</source>
+        <source> Notification First Sent </source>
         <target state="new">首次傳送的通知</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">156</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">175</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.notificationLastSent.string" datatype="html">
-        <source>Notification Last Sent</source>
+        <source> Notification Last Sent </source>
         <target state="new">最近一次傳送通知</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">90</context>
+          <context context-type="linenumber">194</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceaffiliation.notificationLastSent.string" datatype="html">
-        <source>Notification Last Sent</source>
-        <target state="new">Notification Last Sent</target>
+        <source> Notification Last Sent </source>
+        <target state="new"> Notification Last Sent </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.html</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">213</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.copySuccess.string" datatype="html">
@@ -2148,7 +2148,7 @@
         <target state="new">已複製到剪貼簿</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/affiliation/affiliation-detail.component.ts</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">52</context>
         </context-group>
       </trans-unit>
       <trans-unit id="gatewayApp.assertionServiceAssertion.import.title.string" datatype="html">

From 5f15bf6b9c2ab4b77f9d234be84dc4b67d26e5e6 Mon Sep 17 00:00:00 2001
From: andrej romanov <50377758+auumgn@users.noreply.github.com>
Date: Tue, 19 Mar 2024 00:57:12 +0200
Subject: [PATCH 2/5] fix null start end dates

---
 ui/src/app/affiliation/affiliation-update.component.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/app/affiliation/affiliation-update.component.ts b/ui/src/app/affiliation/affiliation-update.component.ts
index e7fe29831..082226c99 100644
--- a/ui/src/app/affiliation/affiliation-update.component.ts
+++ b/ui/src/app/affiliation/affiliation-update.component.ts
@@ -208,10 +208,10 @@ export class AffiliationUpdateComponent implements OnInit {
         roleTitle: assertion.roleTitle,
         url: assertion.url,
         startYear: assertion.startYear,
-        startMonth: parseInt(assertion.startMonth || '0'),
+        startMonth: parseInt(assertion.startMonth || '') || null,
         startDay: assertion.startDay,
         endYear: assertion.endYear,
-        endMonth: parseInt(assertion.endMonth || '0'),
+        endMonth: parseInt(assertion.endMonth || '') || null,
         endDay: assertion.endDay,
         orgName: assertion.orgName,
         orgCountry: assertion.orgCountry,

From cee69d698449fabf57fc7ad4d2e8a753c8c572c9 Mon Sep 17 00:00:00 2001
From: andrej romanov <50377758+auumgn@users.noreply.github.com>
Date: Tue, 19 Mar 2024 16:38:50 +0200
Subject: [PATCH 3/5] fix affiliation edit url

---
 .../affiliation-detail.component.html         | 349 ++++++++++++------
 1 file changed, 237 insertions(+), 112 deletions(-)

diff --git a/ui/src/app/affiliation/affiliation-detail.component.html b/ui/src/app/affiliation/affiliation-detail.component.html
index db6bf7c71..ae75d93d6 100644
--- a/ui/src/app/affiliation/affiliation-detail.component.html
+++ b/ui/src/app/affiliation/affiliation-detail.component.html
@@ -1,116 +1,241 @@
 <div class="row justify-content-center">
-    <div class="col-8">
-        <div *ngIf="affiliation">
-            <h1 class="mt-5" i18n="@@gatewayApp.assertionServiceAssertion.detail.title.string">Affiliation details</h1>
-            <hr>
-            <app-error-alert></app-error-alert>
-            <div class="row">
-                <dl class="jh-entity-details">
-                 	<dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.id.string">ID</dt>
-                    <dd class="col-md-9">
-                        {{affiliation.id}}
-                    </dd>
-                    <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.email.string">Email</dt>
-                    <dd class="col-md-9">
-                        {{affiliation.email}}
-                    </dd>
-                    <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.status.string">Status</dt>
-                    <dd class="col-md-9">
-                        {{affiliation.prettyStatus}}
-                    </dd>
-                    <dt *ngIf="affiliation.permissionLink" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.permissionLink.string">Permission link</dt>
-                    <dd *ngIf="affiliation.permissionLink" class="col-md-9">
-                        <button class="btn btn-outline-primary" type="button" [ngxClipboard] [cbContent]="affiliation.permissionLink" (cbOnSuccess)="successMessage()" i18n="@@gatewayApp.assertionServiceAssertion.copyClipboard.string">Copy to clipboard</button>
-                    </dd>
-                    <dt *ngIf="affiliation.orcidId" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.orcidId.string">ORCID iD</dt>
-                    <dd *ngIf="affiliation.orcidId" class="col-md-9">
-                        <a href="{{orcidBaseUrl}}/{{affiliation.orcidId}}" target="_blank">{{orcidBaseUrl}}/{{affiliation.orcidId}}</a>
-                    </dd>
-                    <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.affiliationSection.string">Affiliation Section</dt>
-                    <dd class="col-md-9">
-                        <span i18n="@@{{'gatewayApp.AffiliationSection.' + affiliation.affiliationSection + '.string'}}">{{affiliation.affiliationSection}}</span>
-                    </dd>
-                    <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.detail.org.string">Organization</dt>
-                    <dd class="col-md-9">
-                        {{affiliation.orgName}}: <span *ngIf="affiliation.orgCity">{{affiliation.orgCity}}</span><span *ngIf="affiliation.orgRegion">, {{affiliation.orgRegion}}</span><span *ngIf="affiliation.orgCountry">, {{affiliation.orgCountry}}</span><br>
-                        {{affiliation.disambiguationSource}} {{affiliation.disambiguatedOrgId}}
-                    </dd>
-                    <dt *ngIf="affiliation.departmentName" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.departmentName.string">Department Name</dt>
-                    <dd *ngIf="affiliation.departmentName" class="col-md-9">
-                        {{affiliation.departmentName}}
-                    </dd>
-                    <dt *ngIf="affiliation.roleTitle" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.roleTitle.string">Role Title</dt>
-                    <dd *ngIf="affiliation.roleTitle" class="col-md-9">
-                        {{affiliation.roleTitle}}
-                    </dd>
-                    <dt *ngIf="affiliation.url" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.url.string">Url</dt>
-                    <dd *ngIf="affiliation.url" class="col-md-9">
-                        <a href="{{affiliation.url}}">{{affiliation.url}}</a>
-                    </dd>
-                    <dt *ngIf="affiliation.startYear" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.startDate.string">Start Date</dt>
-                    <dd *ngIf="affiliation.startYear" class="col-md-9">
-                        {{affiliation.startYear!}}<span *ngIf="affiliation.startMonth">-{{affiliation.startMonth}}</span><span *ngIf="affiliation.startMonth&&affiliation.startDay">-{{affiliation.startDay!}}</span>
-                    </dd>
-                    <dt *ngIf="affiliation.endYear" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.endDate.string">End Date</dt>
-                    <dd *ngIf="affiliation.endYear" class="col-md-9">
-                        {{affiliation.endYear!}}<span *ngIf="affiliation.endMonth">-{{affiliation.endMonth}}</span><span *ngIf="affiliation.endMonth&&affiliation.endDay">-{{affiliation.endDay!}}</span>
-                    </dd>
-                    <dt *ngIf="affiliation.externalId" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.externalId.string">External Id</dt>
-                    <dd *ngIf="affiliation.externalId" class="col-md-9">
-                        {{affiliation.externalIdType!}} <a *ngIf="affiliation.externalIdUrl" href="{{affiliation.externalIdUrl}}">{{affiliation.externalId}}</a> <span *ngIf="!affiliation.externalIdUrl">{{affiliation.externalId}}</span>
-                    </dd>
-                    <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.created.string">Created</dt>
-                    <dd class="col-md-9">
-                        {{affiliation.created!.toString() | date:'medium'}}
-                    </dd>
-                    <dt *ngIf="affiliation.addedToORCID" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.addedToOrcid.string">Added To ORCID</dt>
-                    <dd *ngIf="affiliation.addedToORCID" class="col-md-9">
-                        {{affiliation.addedToORCID!.toString() | date:'medium'}}
-                    </dd>
-                    <dt *ngIf="affiliation.updatedInORCID" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.updatedInOrcid.string">Updated In ORCID</dt>
-                    <dd *ngIf="affiliation.updatedInORCID" class="col-md-9">
-                        {{affiliation.updatedInORCID!.toString() | date:'medium'}}
-                    </dd>
-                    <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.modified.string">Modified</dt>
-                    <dd class="col-md-9">
-                        {{affiliation.modified!.toString() | date:'medium'}} <i><span i18n="@@global.by.string">by</span> {{affiliation.lastModifiedBy}}</i>
-                    </dd>
-                    <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.adminId.string">Admin Id</dt>
-                    <dd class="col-md-9">
-                        {{ownerId}}
-                    </dd>
-                    <dt *ngIf="(!affiliation.invitationSent && affiliation.notificationSent) || (affiliation.notificationSent && affiliation.notificationSent < affiliation.invitationSent!)" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.notificationFirstSent.string">Notification First Sent</dt>
-                    <dd *ngIf="(!affiliation.invitationSent && affiliation.notificationSent) || (affiliation.notificationSent && affiliation.notificationSent < affiliation.invitationSent!)" class="col-md-9">
-                        {{affiliation.notificationSent.toString() | date:'medium'}}
-                    </dd>
-                    <dt *ngIf="(!affiliation.notificationSent && affiliation.invitationSent) || (affiliation.invitationSent && affiliation.invitationSent < affiliation.notificationSent!)" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.notificationFirstSent.string">Notification First Sent</dt>
-                    <dd *ngIf="(!affiliation.notificationSent && affiliation.invitationSent) || (affiliation.invitationSent && affiliation.invitationSent < affiliation.notificationSent!)" class="col-md-9">
-                        {{affiliation.invitationSent.toString() | date:'medium'}}
-                    </dd>
-                    <dt *ngIf="(!affiliation.invitationLastSent && affiliation.notificationLastSent) || (affiliation.notificationLastSent && affiliation.notificationLastSent > affiliation.invitationLastSent!)" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.notificationLastSent.string">Notification Last Sent</dt>
-                    <dd *ngIf="(!affiliation.invitationLastSent && affiliation.notificationLastSent) || (affiliation.notificationLastSent && affiliation.notificationLastSent > affiliation.invitationLastSent!)" class="col-md-9">
-                        {{affiliation.notificationLastSent.toString() | date:'medium'}}
-                    </dd>
-                    <dt *ngIf="(!affiliation.notificationLastSent && affiliation.invitationLastSent) || (affiliation.invitationLastSent && affiliation.invitationLastSent > affiliation.notificationLastSent!)" class="col-md-3" i18n="@@gatewayApp.assertionServiceaffiliation.notificationLastSent.string">Notification Last Sent</dt>
-                    <dd *ngIf="(!affiliation.notificationLastSent && affiliation.invitationLastSent) || (affiliation.invitationLastSent && affiliation.invitationLastSent > affiliation.notificationLastSent!)" class="col-md-9">
-                        {{affiliation.invitationLastSent.toString() | date:'medium'}}
-                    </dd>
-                </dl>
-            </div>
-            <hr>
-            <div class="mb-3">
-                <button type="submit"
-                        (click)="previousState()"
-                        class="btn btn-outline-primary mr-2">
-                    <fa-icon [icon]="faArrowLeft"></fa-icon>&nbsp;<span i18n="@@entity.action.back.string"> Back</span>
-                </button>
+  <div class="col-8">
+    <div *ngIf="affiliation">
+      <h1 class="mt-5" i18n="@@gatewayApp.assertionServiceAssertion.detail.title.string">Affiliation details</h1>
+      <hr />
+      <app-error-alert></app-error-alert>
+      <div class="row">
+        <dl class="jh-entity-details">
+          <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.id.string">ID</dt>
+          <dd class="col-md-9">
+            {{ affiliation.id }}
+          </dd>
+          <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.email.string">Email</dt>
+          <dd class="col-md-9">
+            {{ affiliation.email }}
+          </dd>
+          <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.status.string">Status</dt>
+          <dd class="col-md-9">
+            {{ affiliation.prettyStatus }}
+          </dd>
+          <dt
+            *ngIf="affiliation.permissionLink"
+            class="col-md-3"
+            i18n="@@gatewayApp.assertionServiceAssertion.permissionLink.string"
+          >
+            Permission link
+          </dt>
+          <dd *ngIf="affiliation.permissionLink" class="col-md-9">
+            <button
+              class="btn btn-outline-primary"
+              type="button"
+              [ngxClipboard]
+              [cbContent]="affiliation.permissionLink"
+              (cbOnSuccess)="successMessage()"
+              i18n="@@gatewayApp.assertionServiceAssertion.copyClipboard.string"
+            >
+              Copy to clipboard
+            </button>
+          </dd>
+          <dt *ngIf="affiliation.orcidId" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.orcidId.string">
+            ORCID iD
+          </dt>
+          <dd *ngIf="affiliation.orcidId" class="col-md-9">
+            <a href="{{ orcidBaseUrl }}/{{ affiliation.orcidId }}" target="_blank"
+              >{{ orcidBaseUrl }}/{{ affiliation.orcidId }}</a
+            >
+          </dd>
+          <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.affiliationSection.string">
+            Affiliation Section
+          </dt>
+          <dd class="col-md-9">
+            <span i18n="@@{{'gatewayApp.AffiliationSection.' + affiliation.affiliationSection + '.string'}}">{{
+              affiliation.affiliationSection
+            }}</span>
+          </dd>
+          <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.detail.org.string">Organization</dt>
+          <dd class="col-md-9">
+            {{ affiliation.orgName }}: <span *ngIf="affiliation.orgCity">{{ affiliation.orgCity }}</span
+            ><span *ngIf="affiliation.orgRegion">, {{ affiliation.orgRegion }}</span
+            ><span *ngIf="affiliation.orgCountry">, {{ affiliation.orgCountry }}</span
+            ><br />
+            {{ affiliation.disambiguationSource }} {{ affiliation.disambiguatedOrgId }}
+          </dd>
+          <dt
+            *ngIf="affiliation.departmentName"
+            class="col-md-3"
+            i18n="@@gatewayApp.assertionServiceAssertion.departmentName.string"
+          >
+            Department Name
+          </dt>
+          <dd *ngIf="affiliation.departmentName" class="col-md-9">
+            {{ affiliation.departmentName }}
+          </dd>
+          <dt
+            *ngIf="affiliation.roleTitle"
+            class="col-md-3"
+            i18n="@@gatewayApp.assertionServiceAssertion.roleTitle.string"
+          >
+            Role Title
+          </dt>
+          <dd *ngIf="affiliation.roleTitle" class="col-md-9">
+            {{ affiliation.roleTitle }}
+          </dd>
+          <dt *ngIf="affiliation.url" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.url.string">Url</dt>
+          <dd *ngIf="affiliation.url" class="col-md-9">
+            <a href="{{ affiliation.url }}">{{ affiliation.url }}</a>
+          </dd>
+          <dt
+            *ngIf="affiliation.startYear"
+            class="col-md-3"
+            i18n="@@gatewayApp.assertionServiceAssertion.startDate.string"
+          >
+            Start Date
+          </dt>
+          <dd *ngIf="affiliation.startYear" class="col-md-9">
+            {{ affiliation.startYear! }}<span *ngIf="affiliation.startMonth">-{{ affiliation.startMonth }}</span
+            ><span *ngIf="affiliation.startMonth && affiliation.startDay">-{{ affiliation.startDay! }}</span>
+          </dd>
+          <dt *ngIf="affiliation.endYear" class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.endDate.string">
+            End Date
+          </dt>
+          <dd *ngIf="affiliation.endYear" class="col-md-9">
+            {{ affiliation.endYear! }}<span *ngIf="affiliation.endMonth">-{{ affiliation.endMonth }}</span
+            ><span *ngIf="affiliation.endMonth && affiliation.endDay">-{{ affiliation.endDay! }}</span>
+          </dd>
+          <dt
+            *ngIf="affiliation.externalId"
+            class="col-md-3"
+            i18n="@@gatewayApp.assertionServiceAssertion.externalId.string"
+          >
+            External Id
+          </dt>
+          <dd *ngIf="affiliation.externalId" class="col-md-9">
+            {{ affiliation.externalIdType! }}
+            <a *ngIf="affiliation.externalIdUrl" href="{{ affiliation.externalIdUrl }}">{{ affiliation.externalId }}</a>
+            <span *ngIf="!affiliation.externalIdUrl">{{ affiliation.externalId }}</span>
+          </dd>
+          <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.created.string">Created</dt>
+          <dd class="col-md-9">
+            {{ affiliation.created!.toString() | date: 'medium' }}
+          </dd>
+          <dt
+            *ngIf="affiliation.addedToORCID"
+            class="col-md-3"
+            i18n="@@gatewayApp.assertionServiceAssertion.addedToOrcid.string"
+          >
+            Added To ORCID
+          </dt>
+          <dd *ngIf="affiliation.addedToORCID" class="col-md-9">
+            {{ affiliation.addedToORCID!.toString() | date: 'medium' }}
+          </dd>
+          <dt
+            *ngIf="affiliation.updatedInORCID"
+            class="col-md-3"
+            i18n="@@gatewayApp.assertionServiceAssertion.updatedInOrcid.string"
+          >
+            Updated In ORCID
+          </dt>
+          <dd *ngIf="affiliation.updatedInORCID" class="col-md-9">
+            {{ affiliation.updatedInORCID!.toString() | date: 'medium' }}
+          </dd>
+          <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.modified.string">Modified</dt>
+          <dd class="col-md-9">
+            {{ affiliation.modified!.toString() | date: 'medium' }}
+            <i><span i18n="@@global.by.string">by</span> {{ affiliation.lastModifiedBy }}</i>
+          </dd>
+          <dt class="col-md-3" i18n="@@gatewayApp.assertionServiceAssertion.adminId.string">Admin Id</dt>
+          <dd class="col-md-9">
+            {{ ownerId }}
+          </dd>
+          <dt
+            *ngIf="
+              (!affiliation.invitationSent && affiliation.notificationSent) ||
+              (affiliation.notificationSent && affiliation.notificationSent < affiliation.invitationSent!)
+            "
+            class="col-md-3"
+            i18n="@@gatewayApp.assertionServiceAssertion.notificationFirstSent.string"
+          >
+            Notification First Sent
+          </dt>
+          <dd
+            *ngIf="
+              (!affiliation.invitationSent && affiliation.notificationSent) ||
+              (affiliation.notificationSent && affiliation.notificationSent < affiliation.invitationSent!)
+            "
+            class="col-md-9"
+          >
+            {{ affiliation.notificationSent.toString() | date: 'medium' }}
+          </dd>
+          <dt
+            *ngIf="
+              (!affiliation.notificationSent && affiliation.invitationSent) ||
+              (affiliation.invitationSent && affiliation.invitationSent < affiliation.notificationSent!)
+            "
+            class="col-md-3"
+            i18n="@@gatewayApp.assertionServiceAssertion.notificationFirstSent.string"
+          >
+            Notification First Sent
+          </dt>
+          <dd
+            *ngIf="
+              (!affiliation.notificationSent && affiliation.invitationSent) ||
+              (affiliation.invitationSent && affiliation.invitationSent < affiliation.notificationSent!)
+            "
+            class="col-md-9"
+          >
+            {{ affiliation.invitationSent.toString() | date: 'medium' }}
+          </dd>
+          <dt
+            *ngIf="
+              (!affiliation.invitationLastSent && affiliation.notificationLastSent) ||
+              (affiliation.notificationLastSent && affiliation.notificationLastSent > affiliation.invitationLastSent!)
+            "
+            class="col-md-3"
+            i18n="@@gatewayApp.assertionServiceAssertion.notificationLastSent.string"
+          >
+            Notification Last Sent
+          </dt>
+          <dd
+            *ngIf="
+              (!affiliation.invitationLastSent && affiliation.notificationLastSent) ||
+              (affiliation.notificationLastSent && affiliation.notificationLastSent > affiliation.invitationLastSent!)
+            "
+            class="col-md-9"
+          >
+            {{ affiliation.notificationLastSent.toString() | date: 'medium' }}
+          </dd>
+          <dt
+            *ngIf="
+              (!affiliation.notificationLastSent && affiliation.invitationLastSent) ||
+              (affiliation.invitationLastSent && affiliation.invitationLastSent > affiliation.notificationLastSent!)
+            "
+            class="col-md-3"
+            i18n="@@gatewayApp.assertionServiceaffiliation.notificationLastSent.string"
+          >
+            Notification Last Sent
+          </dt>
+          <dd
+            *ngIf="
+              (!affiliation.notificationLastSent && affiliation.invitationLastSent) ||
+              (affiliation.invitationLastSent && affiliation.invitationLastSent > affiliation.notificationLastSent!)
+            "
+            class="col-md-9"
+          >
+            {{ affiliation.invitationLastSent.toString() | date: 'medium' }}
+          </dd>
+        </dl>
+      </div>
+      <hr />
+      <div class="mb-3">
+        <button type="submit" (click)="previousState()" class="btn btn-outline-primary mr-2">
+          <fa-icon [icon]="faArrowLeft"></fa-icon>&nbsp;<span i18n="@@entity.action.back.string"> Back</span>
+        </button>
 
-                <button type="button"
-                        [routerLink]="['/affiliation', affiliation!.id, 'edit']"
-                        class="btn btn-primary">
-                    <fa-icon [icon]="faPencilAlt"></fa-icon>&nbsp;<span i18n="@@entity.action.edit.string"> Edit</span>
-                </button>
-            </div>
-        </div>
+        <button type="button" [routerLink]="['/affiliations', affiliation!.id, 'edit']" class="btn btn-primary">
+          <fa-icon [icon]="faPencilAlt"></fa-icon>&nbsp;<span i18n="@@entity.action.edit.string"> Edit</span>
+        </button>
+      </div>
     </div>
+  </div>
 </div>

From 5b91f454e6017a626463ef92566880f48ac9a131 Mon Sep 17 00:00:00 2001
From: andrej romanov <50377758+auumgn@users.noreply.github.com>
Date: Tue, 19 Mar 2024 16:41:35 +0200
Subject: [PATCH 4/5] fix invalid date label

---
 ui/src/app/affiliation/affiliation-update.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/app/affiliation/affiliation-update.component.html b/ui/src/app/affiliation/affiliation-update.component.html
index 15684095f..480ecadc5 100644
--- a/ui/src/app/affiliation/affiliation-update.component.html
+++ b/ui/src/app/affiliation/affiliation-update.component.html
@@ -406,7 +406,7 @@
           <br />
           <div *ngIf="editForm.get('endYear')?.hasError('dateValidator')">
             <small class="form-text text-danger" jhiTranslate="entity.validation.endDate.string">
-              End date cannot be greater than the start date
+              Start date cannot be greater than the end date
             </small>
           </div>
         </div>

From bfd9a1725ee3820f1e9de2fb2eb20a2f1db31d87 Mon Sep 17 00:00:00 2001
From: andrej romanov <50377758+auumgn@users.noreply.github.com>
Date: Tue, 19 Mar 2024 16:50:46 +0200
Subject: [PATCH 5/5] fix org validation

---
 ui/src/app/affiliation/affiliation-update.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/app/affiliation/affiliation-update.component.html b/ui/src/app/affiliation/affiliation-update.component.html
index 15684095f..e876b48f9 100644
--- a/ui/src/app/affiliation/affiliation-update.component.html
+++ b/ui/src/app/affiliation/affiliation-update.component.html
@@ -221,7 +221,7 @@
               <small
                 class="form-text text-danger"
                 *ngIf="
-                  !editForm.get('disambiguatedOrgId')?.errors ||
+                  !this.editForm.get('disambiguatedOrgId')?.hasError('validDisambiguatedOrgId') ||
                   (editForm.get('disambiguatedOrgId')?.errors)!['required']
                 "
                 jhiTranslate="entity.validation.disambiguatedOrgId.string"