[KON-603]: Total Commit
Signed-off-by: Dennis Schmitt <dennis.schmitt@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/proxy.conf-integration.json b/proxy.conf-integration.json
index 27430d8..ace58c5 100644
--- a/proxy.conf-integration.json
+++ b/proxy.conf-integration.json
@@ -1,6 +1,6 @@
{
"/api": {
- "target": "http://entdockergss:9155",
+ "target": "http://entdockergss:9156",
"secure": false,
"pathRewrite": {
"^/api": ""
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..49e91b3 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>
@@ -133,7 +127,7 @@
[queryParameter]="modifiedContacts"
autoResizeColumns
class="ag-theme-balham"
- style="min-width: 982px; height: calc(100vh - 276px);"
+ style="min-width: 1130px; height: calc(100vh - 276px);"
[gridOptions]="gridOptions"
[columnDefs]="columnDefinition"
[rowSelection]="'single'"
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..491a58d 100644
--- a/src/app/pages/contacts/contacts-list/contacts-list.component.scss
+++ b/src/app/pages/contacts/contacts-list/contacts-list.component.scss
@@ -22,7 +22,7 @@
display: flex;
justify-content: space-between;
align-content: center;
- min-width: 982px;
+ min-width: 1130px;
background-color: #f5f7f7;
border: 1px solid rgb(189, 195, 199);
padding: 7px 7px 5px 7px;
@@ -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 fc13786..26ad894 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
@@ -31,10 +31,6 @@
autocomplete="off"
/>
</div>
-
- <div class="col-sm-4" *ngIf="internalPersonSandBox.showSynchAlertMessage">
- <span>Test Text</span>
- </div>
</div>
<!-- lastName -->
@@ -53,6 +49,13 @@
</div>
</div>
+ <div class="syncAlertMessage" *ngIf="internalPersonSandBox.showSyncAlertMessage">
+ <span>
+ Achtung: <br />Dieser Kontakt wird mit einem anderen System synchronisiert. <br />
+ Manuelle Änderungen gehen möglicherweise verloren.
+ </span>
+ </div>
+
<!-- title -->
<div class="form-group row">
<label for="title" class="col-sm-2 col-form-label">{{ 'Internal.PersonTitle' | translate }}</label>
@@ -104,7 +107,7 @@
<div class="col-sm-4">
<input
placeholder="{{ 'Search' | translate }}"
- id="typeahead-basic"
+ id="uidTypeahead"
type="text"
maxlength="255"
class="form-control"
@@ -125,7 +128,7 @@
autocomplete="off"
/>
</div>
- <button type="button" (click)="internalPersonSandBox.setLdapUidValue(null)" class="tool-icon">
+ <button type="button" style="flex-basis: 10px;" (click)="internalPersonSandBox.setLdapUidValue(null)" class="tool-icon">
<fa name="trash"></fa>
</button>
</div>
@@ -136,7 +139,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.component.scss b/src/app/pages/persons/internal-person/internal-person-details/internal-person-details.component.scss
index d73298c..a2ba532 100644
--- a/src/app/pages/persons/internal-person/internal-person-details/internal-person-details.component.scss
+++ b/src/app/pages/persons/internal-person/internal-person-details/internal-person-details.component.scss
@@ -52,3 +52,13 @@
.expandable-module-assignment .collapse5 {
height: 338px;
}
+.syncAlertMessage {
+ position: absolute;
+ right: 0px;
+ top: 0px;
+ margin: 20px;
+ padding: 14px;
+ font-size: 13px;
+ background-color: rgba(255, 178, 0, 0.2);
+ border: 1px solid rgba(0, 0, 0, 0.15);
+}
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 f61ebf8..02b6b55 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
@@ -49,7 +49,7 @@
public isCommunicationsDataDetailViewVisible: boolean = false;
public isAddressDataDetailViewVisible: boolean = false;
public existMainAddress = false;
- public showSynchAlertMessage = false;
+ public showSyncAlertMessage = false;
public isCurrentAddressMainAddress = false;
public internalPersonContactId: string;
private _currentInternalPerson: InternalPerson = null;
@@ -255,11 +255,7 @@
this.internalPersonDetailsFormState$.pipe(takeUntil(this._endSubscriptions$)).subscribe((formState: FormGroupState<InternalPerson>) => {
this.internalPersonDetailsCurrentFormState = formState;
- if (!!formState.value.uid) {
- this.showSynchAlertMessage = true;
- } else {
- this.showSynchAlertMessage = false;
- }
+ this.showSyncAlertMessage = !!formState.value && (!!formState.value.uid || !!formState.value.userRef) ? true : false;
});
}
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;
+}
