KON-615 FE Neu-Buttons in Stammdaten umbenennen entsprechend dem Beispiel "Neu" zu "Neuen Personentyp anlegen"
KON-614 FE Schaltfläche für Dropdown "Neuen Kontakt anlegen" analog zu Neu-Schaltflächen blau färben
KON-610 FE Begriff "Modulzuordnung" überall ersetzen durch "Zugeordnete Module"
KON-609 FE Begriff "Adressliste" überall ersetzen durch "Adressen"
KON-608 FE Suchfeld für LDAP und Portaluser bzgl. des Verhaltens bei sehr vielen Treffern untersuchen und ggf. verbessern
KON-606 FE Lupe für die Suche ausbauen
Signed-off-by: Dimitrios Chalepakis <dimitrios.chalepakis@pta.de>
diff --git a/i18n/admin.de.json b/i18n/admin.de.json
index b5bb4e7..2f2278e 100644
--- a/i18n/admin.de.json
+++ b/i18n/admin.de.json
@@ -1,32 +1,36 @@
{
"Salutations": {
- "Link": "Anreden verwalten",
- "Title": "Übersicht Anrede",
+ "Link": "Anreden verwalten",
+ "Title": "Übersicht Anrede",
"DetailsTitle": "Anrede Details",
- "Type": "Typ",
- "Description": "Beschreibung"
+ "Type": "Typ",
+ "Description": "Beschreibung",
+ "New": "Neue Anrede anlegen"
},
"CommunicationTypes": {
- "Link": "Kommunikationstypen verwalten",
- "Title": "Übersicht Kommunikationstypen",
+ "Link": "Kommunikationstypen verwalten",
+ "Title": "Übersicht Kommunikationstypen",
"DetailsTitle": "Kommunikationstypen Details",
- "Type": "Typ",
- "Description": "Beschreibung",
- "Editable": "Editierbar",
- "MappingLdap": "LDAP Mapping"
+ "Type": "Typ",
+ "Description": "Beschreibung",
+ "Editable": "Editierbar",
+ "MappingLdap": "LDAP Mapping",
+ "New": "Neuen Kommunikationstyp anlegen"
},
"PersonTypes": {
- "Link": "Personentypen verwalten",
- "Title": "Übersicht Personentypen",
+ "Link": "Personentypen verwalten",
+ "Title": "Übersicht Personentypen",
"DetailsTitle": "Personentypen Details",
- "Type": "Typ",
- "Description": "Beschreibung"
+ "Type": "Typ",
+ "Description": "Beschreibung",
+ "New": "Neuen Personentyp anlegen"
},
"AddressTypes": {
- "Link": "Adresstypen verwalten",
- "Title": "Übersicht Adresstypen",
+ "Link": "Adresstypen verwalten",
+ "Title": "Übersicht Adresstypen",
"DetailsTitle": "Adresstypen Details",
- "Type": "Typ",
- "Description": "Beschreibung"
+ "Type": "Typ",
+ "Description": "Beschreibung",
+ "New": "Neuen Adresstyp anlegen"
}
}
diff --git a/i18n/contacts.de.json b/i18n/contacts.de.json
index 8b4205b..d9d7013 100644
--- a/i18n/contacts.de.json
+++ b/i18n/contacts.de.json
@@ -14,14 +14,14 @@
"InternalContact": "Interner Kontakt",
"ExternalContact": "Externer Kontakt",
"Company": "Unternehmen",
- "AddressList": "Adressliste",
+ "AddressList": "Adressen",
"AllContactTypes": "Alle Kontakttypen",
"Department": "Abteilung",
"CommunicationsDataList": "Kommunikationskanäle",
"ContactPersonList": "Ansprechpartner",
- "ModuleAssignment": "Modulzuordnung",
- "AllModuleAssignments": "Alle Modulzuordnungen",
- "WithoutModuleAssignment": "Keine Modulzuordnung",
+ "ModuleAssignment": "Zugeordnete Module",
+ "AllModuleAssignments": "Alle zugeordnete Module",
+ "WithoutModuleAssignment": "Keine zugeordnete Module",
"DSGVO-advanced-filter": "DSGVO - Filtererweiterung",
"DSGVO-advanced-filter-deletion-lock-exceeded": "Filterung nach Kontakten mit abgelaufener Löschsperre",
"DSGVO-advanced-filter-expiring-data-in-past": "Filterung nach Kontakten mit überschrittenem Ablaufdatum",
diff --git a/i18n/user-module-assignment.de.json b/i18n/user-module-assignment.de.json
index 13f4517..9355781 100644
--- a/i18n/user-module-assignment.de.json
+++ b/i18n/user-module-assignment.de.json
@@ -5,7 +5,7 @@
"ExpiringDate": "Ablaufdatum",
"DeletionLockUntil": "Löschsperre bis",
"AssignmentNote": "Notiz",
- "NewUserModuleAssignment": "Neue Modulzuordnung anlegen",
- "EditUserModuleAssignment": "Modulzuordnung bearbeiten"
+ "NewUserModuleAssignment": "Neue zugeordnete Module anlegen",
+ "EditUserModuleAssignment": "Zugeordnete Module bearbeiten"
}
}
diff --git a/src/app/pages/admin/address-types/address-types-list/address-types-list.component.html b/src/app/pages/admin/address-types/address-types-list/address-types-list.component.html
index 3473e48..f04ce79 100644
--- a/src/app/pages/admin/address-types/address-types-list/address-types-list.component.html
+++ b/src/app/pages/admin/address-types/address-types-list/address-types-list.component.html
@@ -15,7 +15,7 @@
<span>{{ 'AddressTypes.Title' | translate }}</span>
<div class="pull-right" *visibleByRight>
<button class="btn btn-primary new-button" (click)="sandbox.setDisplayForm()">
- {{ 'NewBtn' | translate }}
+ {{ 'AddressTypes.New' | translate }}
</button>
</div>
</div>
diff --git a/src/app/pages/admin/communication-types/communication-types-list/communication-types-list.component.html b/src/app/pages/admin/communication-types/communication-types-list/communication-types-list.component.html
index 3c7b56e..a2d20ec 100644
--- a/src/app/pages/admin/communication-types/communication-types-list/communication-types-list.component.html
+++ b/src/app/pages/admin/communication-types/communication-types-list/communication-types-list.component.html
@@ -15,7 +15,7 @@
<span>{{ 'CommunicationTypes.Title' | translate }}</span>
<div class="pull-right" *visibleByRight>
<button class="btn btn-primary new-button" (click)="communicationTypesSandbox.setDisplayForm()">
- {{ 'NewBtn' | translate }}
+ {{ 'CommunicationTypes.New' | translate }}
</button>
</div>
</div>
diff --git a/src/app/pages/admin/person-types/person-types-list/person-types-list.component.html b/src/app/pages/admin/person-types/person-types-list/person-types-list.component.html
index 3b17791..7dd8517 100644
--- a/src/app/pages/admin/person-types/person-types-list/person-types-list.component.html
+++ b/src/app/pages/admin/person-types/person-types-list/person-types-list.component.html
@@ -15,7 +15,7 @@
<span>{{ 'PersonTypes.Title' | translate }}</span>
<div class="pull-right" *visibleByRight>
<button class="btn btn-primary new-button" (click)="sandbox.setDisplayForm()">
- {{ 'NewBtn' | translate }}
+ {{ 'PersonTypes.New' | translate }}
</button>
</div>
</div>
diff --git a/src/app/pages/admin/salutations/salutations-list/salutations-list.component.html b/src/app/pages/admin/salutations/salutations-list/salutations-list.component.html
index 007fd6b..bfca349 100644
--- a/src/app/pages/admin/salutations/salutations-list/salutations-list.component.html
+++ b/src/app/pages/admin/salutations/salutations-list/salutations-list.component.html
@@ -15,7 +15,7 @@
<span>{{ 'Salutations.Title' | translate }}</span>
<div class="pull-right" *visibleByRight>
<button class="btn btn-primary new-button" (click)="salutationsSandbox.setDisplayForm()">
- {{ 'NewBtn' | translate }}
+ {{ 'Salutations.New' | translate }}
</button>
</div>
</div>
diff --git a/src/app/pages/contacts/contacts-list/contacts-list.component.html b/src/app/pages/contacts/contacts-list/contacts-list.component.html
index 5ee3de8..badcfa7 100644
--- a/src/app/pages/contacts/contacts-list/contacts-list.component.html
+++ b/src/app/pages/contacts/contacts-list/contacts-list.component.html
@@ -93,12 +93,6 @@
</div>
</div>
</div>
-
- <div class="search-btn">
- <button type="button" class="btn btn-default btn-sm" (click)="searchContacts($event)" title="suchen">
- <em style="color: #495057;" class="fa fa-search fa-lg " aria-hidden="true "></em>
- </button>
- </div>
</div>
<div class="sorting-options diverse-options-item">
@@ -119,7 +113,7 @@
</div>
<div class="select-type-of-new-contact item" *visibleByRight>
- <select type="text" class="form-control" (change)="navigateTo($event.target.value)">
+ <select type="text" class="form-control" id="newContactDropDown" (change)="navigateTo($event.target.value)">
<option value="" disabled selected>{{ 'Contacts.CreateNewContact' | translate }}</option>
<option [value]="NEW_INTERNAL_PERSON_PATH">{{ 'Contacts.InternalContact' | translate }}</option>
<option [value]="NEW_EXTERNAL_PERSON_PATH">{{ 'Contacts.ExternalContact' | translate }}</option>
diff --git a/src/app/pages/contacts/contacts-list/contacts-list.component.scss b/src/app/pages/contacts/contacts-list/contacts-list.component.scss
index 7b3ad89..003b9a0 100644
--- a/src/app/pages/contacts/contacts-list/contacts-list.component.scss
+++ b/src/app/pages/contacts/contacts-list/contacts-list.component.scss
@@ -120,3 +120,8 @@
.dsgvo-filter-item {
margin: 4px 0px 0px 12px;
}
+
+#newContactDropDown {
+ background-color: #003a5f;
+ color: white;
+}
diff --git a/src/app/pages/persons/internal-person/internal-person-details/internal-person-details.component.html b/src/app/pages/persons/internal-person/internal-person-details/internal-person-details.component.html
index 29a9637..1fae53a 100644
--- a/src/app/pages/persons/internal-person/internal-person-details/internal-person-details.component.html
+++ b/src/app/pages/persons/internal-person/internal-person-details/internal-person-details.component.html
@@ -100,7 +100,7 @@
<div class="col-sm-4">
<input
placeholder="{{ 'Search' | translate }}"
- id="typeahead-basic"
+ id="uidTypeahead"
type="text"
maxlength="255"
class="form-control"
@@ -132,7 +132,7 @@
<div class="col-sm-4">
<input
placeholder="{{ 'Search' | translate }}"
- id="typeahead-basic"
+ id="userrefTypeahead"
type="text"
maxlength="255"
class="form-control"
diff --git a/src/app/pages/persons/internal-person/internal-person-details/internal-person-details.sandbox.ts b/src/app/pages/persons/internal-person/internal-person-details/internal-person-details.sandbox.ts
index 45611ab..cd1c83d 100644
--- a/src/app/pages/persons/internal-person/internal-person-details/internal-person-details.sandbox.ts
+++ b/src/app/pages/persons/internal-person/internal-person-details/internal-person-details.sandbox.ts
@@ -78,15 +78,19 @@
this._checkIfCurrentAddressIsMainAddress(address);
});
- this.actionsSubject
- .pipe(
- ofType(keycloakUserActions.loadKeycloakUsersSuccess),
- map((action: keycloakUserActions.ILoadKeycloakUsersSuccess) => action.payload),
- takeUntil(this._endSubscriptions$)
- )
- .subscribe((users: Array<KeycloakUser>) => {
- this._keycloakUsers = users;
- });
+ // this.actionsSubject
+ // .pipe(
+ // ofType(keycloakUserActions.loadKeycloakUsersSuccess),
+ // map((action: keycloakUserActions.ILoadKeycloakUsersSuccess) => action.payload),
+ // takeUntil(this._endSubscriptions$)
+ // )
+ // .subscribe((users: Array<KeycloakUser>) => {
+ // this._keycloakUsers = users;
+ // });
+ const user1: KeycloakUser = { username: 'admin', firstName: 'admin', lastName: 'admin' };
+ for (let index = 0; index < 40; index++) {
+ this._keycloakUsers.push(user1);
+ }
this.actionsSubject
.pipe(
diff --git a/src/styles.scss b/src/styles.scss
index 2dbdaf8..2f3c29f 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -7045,3 +7045,8 @@
.simple-notification.error {
color: white !important;
}
+
+.dropdown-menu {
+ max-height: 300px;
+ overflow-y: auto;
+}
