BTB-35 automatisch Modulzuordnung im Kontaktstammdatemodul erhalten
diff --git a/karma.conf.js b/karma.conf.js
index 61cdfd3..32d3686 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -56,6 +56,7 @@
     customLaunchers: {
       ChromeDebugging: {
         base: 'ChromeHeadless',
+        /* base: 'Chrome', */
         flags: ['--remote-debugging-port=9333']
       }
     },
diff --git a/src/app/common-components/autocomplete/autocomplete.component.html b/src/app/common-components/autocomplete/autocomplete.component.html
index f5d25d8..9c9fa17 100644
--- a/src/app/common-components/autocomplete/autocomplete.component.html
+++ b/src/app/common-components/autocomplete/autocomplete.component.html
@@ -11,7 +11,7 @@
 -->
 
 <div class="autocomplete-container" >
-  <input class="form-control entry-input" autocomplete="off" type="search" [(ngModel)]="responsibilityForwarding" (ngModelChange)="searchChanged($event)" (keyup)="filter($event)" (focus) = "handleFocus()" name="responsibilityForwardingInput" maxlength="100">    
+  <input class="form-control entry-input" autocomplete="off" type="search" [(ngModel)]="notification.responsibilityForwarding" (ngModelChange)="searchChanged($event)" (keyup)="filter($event)" (focus) = "handleFocus()" name="responsibilityForwardingInput" maxlength="100">    
    <div id="suggestions-id" class="suggestions" *ngIf="filteredList.length > 0"> 
     <ul>
         <li *ngFor="let item of filteredList" [class.complete-selected]="item.selected" [id]="item.selected">                                     
diff --git a/src/app/common-components/autocomplete/autocomplete.component.spec.ts b/src/app/common-components/autocomplete/autocomplete.component.spec.ts
index 8b54013..9816285 100644
--- a/src/app/common-components/autocomplete/autocomplete.component.spec.ts
+++ b/src/app/common-components/autocomplete/autocomplete.component.spec.ts
@@ -18,6 +18,8 @@
 import { FormsModule } from '@angular/forms';
 import { click, focus, newEvent, pressKey } from '../../testing/index';
 import { MessageService } from '../../services/message.service';
+import { CONTACTTUPEL } from 'app/test-data/contact-tupel';
+import { DUMMY_NOTIFICATION } from 'app/test-data/notifications';
 
 describe('AutocompleteComponent', () => {
   let component: AutocompleteComponent;
@@ -61,8 +63,10 @@
   });
 
   it('test2: should call setAssignedUserSuggestion on focus', async(() => {
-    const userSuggestionsList = ['User1', 'TestUser1', 'TestUser2', 'User2', 'User3'];
-    mockService.content = userSuggestionsList;
+    component.notification = DUMMY_NOTIFICATION;
+    const userSuggestionsList = CONTACTTUPEL;
+    mockService.content = userSuggestionsList;  
+    
 
     fixture.detectChanges();
 
@@ -83,7 +87,9 @@
 
   it('test2.1: should call setAssignedUserSuggestion on focus and return an error', async(() => {
     spyOn(component, 'createItemList').and.callThrough();
-    const userSuggestionsList = ['User1', 'TestUser1', 'TestUser2', 'User2', 'User3'];
+    component.notification = DUMMY_NOTIFICATION;
+
+    const userSuggestionsList = [];
     mockService.error = 'MOCKERROR';
     fixture.detectChanges();
 
@@ -102,7 +108,9 @@
   }));
 
   it('test3: should filter all usersnames containing "test"', fakeAsync(() => {
-    const userSuggestionsList = ['User1', 'TestUser1', 'TestUser2', 'User2', 'User3'];
+    //const userSuggestionsList = ['User1', 'TestUser1', 'TestUser2', 'User2', 'User3'];
+    component.notification = DUMMY_NOTIFICATION;
+    const userSuggestionsList = CONTACTTUPEL;
     mockService.content = userSuggestionsList;
 
     fixture.detectChanges();
@@ -120,7 +128,7 @@
     inputElement.dispatchEvent(newEvent('input'));
     fixture.detectChanges();
 
-    expect(component.responsibilityForwarding).toBe('test');
+    expect(component.notification.responsibilityForwarding).toBe('test');
 
     //keycode 56 = 'a' : random keycode just to satisfy the filter method 
     // the actual value stays untouched
@@ -135,7 +143,9 @@
   }));
 
   it('test4: should select 2nd item in list after pressing "Arrow-key Down" 2 times and then "Enter"', fakeAsync(() => {
-    const userSuggestionsList = ['User1', 'TestUser1', 'TestUser2', 'User2', 'User3'];
+    //const userSuggestionsList = ['User1', 'TestUser1', 'TestUser2', 'User2', 'User3'];
+    component.notification = DUMMY_NOTIFICATION;
+    const userSuggestionsList = CONTACTTUPEL;
     mockService.content = userSuggestionsList;
 
     fixture.detectChanges();
@@ -148,7 +158,7 @@
     fixture.detectChanges();
 
     component.filterQuery();
-    component.responsibilityForwarding = 'user';
+    component.notification.responsibilityForwarding = 'user';
     tick();
     fixture.detectChanges();
 
@@ -165,13 +175,15 @@
     fixture.detectChanges();
 
     //selected user 2x down arrow & 1x enter
-    expect(component.responsibilityForwarding).toBe('TestUser1');
+    expect(component.notification.responsibilityForwarding).toBe('TestUser2');
 
   }));
 
   it('test4.1 : should select 1st item in list after pressing "Arrow-key Down" 2x and\
       "Arrow-key Up" again and then "Enter"', fakeAsync(() => {
-      const userSuggestionsList = ['User1', 'TestUser1', 'TestUser2', 'User2', 'User3'];
+      //const userSuggestionsList = ['User1', 'TestUser1', 'TestUser2', 'User2', 'User3'];
+      component.notification = DUMMY_NOTIFICATION;
+      const userSuggestionsList = CONTACTTUPEL;
       mockService.content = userSuggestionsList;
 
       fixture.detectChanges();
@@ -184,7 +196,7 @@
       fixture.detectChanges();
 
       component.filterQuery();
-      component.responsibilityForwarding = 'user';
+      component.notification.responsibilityForwarding = 'user';
       tick();
       fixture.detectChanges();
 
@@ -203,12 +215,13 @@
       fixture.detectChanges();
 
       //selected user 2x down arrow & 1x enter
-      expect(component.responsibilityForwarding).toBe('User1');
+      expect(component.notification.responsibilityForwarding).toBe('TestUser2');
 
     }));
 
   it('test5: should call handleClick', () => {
     spyOn(component, 'handleClick').and.callThrough();
+    component.notification = DUMMY_NOTIFICATION;    
 
     const keyEventObj = new Event('click');
     Object.defineProperty(keyEventObj, 'target', { 'value': component.elementRef.nativeElement });
@@ -221,6 +234,7 @@
 
   it('test6: should call handleKeyboardEvent', () => {
     spyOn(component, 'handleKeyboardEvent').and.callThrough();
+    component.notification = DUMMY_NOTIFICATION;
 
     const keyEventObj = new Event('keypress');
     Object.defineProperty(keyEventObj, 'keyCode', { 'value': 13 });
@@ -234,7 +248,9 @@
 
   it('test6.1: should call handleKeyboardEvent', fakeAsync(() => {
     spyOn(component, 'handleKeyboardEvent').and.callThrough();
-    const userSuggestionsList = ['User1', 'TestUser1', 'TestUser2', 'User2', 'User3'];
+    //const userSuggestionsList = ['User1', 'TestUser1', 'TestUser2', 'User2', 'User3'];
+    component.notification = DUMMY_NOTIFICATION;
+    const userSuggestionsList = CONTACTTUPEL;
     mockService.content = userSuggestionsList;
     fixture.detectChanges();
 
@@ -246,7 +262,7 @@
     fixture.detectChanges();
 
     component.filterQuery();
-    component.responsibilityForwarding = 'user';
+    component.notification.responsibilityForwarding = 'user';
     tick();
     fixture.detectChanges();
 
@@ -263,13 +279,14 @@
     tick();
 
     expect(component.handleKeyboardEvent).toHaveBeenCalledTimes(1);
-    expect(component.responsibilityForwarding).toBe(userSuggestionsList[0]);
+    expect(component.notification.responsibilityForwarding).toBe(userSuggestionsList[2].contactName);
     expect(component.filteredList.length).toBe(0);
     expect(component.position).toBe(-1);
   }));
 
   it('test7: should call handleKeyDown', () => {
     spyOn(component, 'handleKeyDown').and.callThrough();
+    component.notification = DUMMY_NOTIFICATION;    
 
     const keyEventObj = new Event('keydown');
     Object.defineProperty(keyEventObj, 'keyCode', { 'value': 40 });
@@ -285,8 +302,11 @@
   });
 
   it('test8: should clear the suggestions when responsibilityForwarding is empty', fakeAsync(() => {
-    const userSuggestionsList = ['User1', 'TestUser1', 'TestUser2', 'User2', 'User3'];
+    component.notification = DUMMY_NOTIFICATION;
+    const userSuggestionsList = CONTACTTUPEL;
+    //const userSuggestionsList = ['User1', 'TestUser1', 'TestUser2', 'User2', 'User3'];
     mockService.content = userSuggestionsList;
+    
 
     fixture.detectChanges();
 
@@ -296,7 +316,7 @@
     focus(de);
     tick();
     fixture.detectChanges();
-    component.responsibilityForwarding = '';
+    component.notification.responsibilityForwarding = '';
     pressKey(de, 'keyup', 47);
     tick();
     fixture.detectChanges();
diff --git a/src/app/common-components/autocomplete/autocomplete.component.ts b/src/app/common-components/autocomplete/autocomplete.component.ts
index 09b9881..9847247 100644
--- a/src/app/common-components/autocomplete/autocomplete.component.ts
+++ b/src/app/common-components/autocomplete/autocomplete.component.ts
@@ -13,6 +13,7 @@
 import { NotificationService } from '../../services/notification.service';
 import { BannerMessageStatusEn, ErrorType } from '../../common/enums';
 import { MessageService, MessageDefines } from '../../services/message.service';
+import { ContactTupel } from 'app/model/contact-tupel';
 
 @Component({
   selector: 'app-autocomplete',
@@ -21,9 +22,9 @@
 })
 export class AutocompleteComponent {
 
-  @Input() responsibilityForwarding = '';
-  @Output() responsibilityForwardingChange = new EventEmitter();
-  inputElementList: string[] = [];
+  @Input() notification;
+  @Output() notificationChange = new EventEmitter();
+  inputElementList: ContactTupel[] = [];
   filteredList: any[] = [];
   item: any;
   items: any[] = [];
@@ -41,8 +42,9 @@
     if (newValue === '') {
       newValue = null;
     }
-    this.responsibilityForwarding = newValue;
-    this.responsibilityForwardingChange.emit(newValue);
+
+    this.notification.responsibilityForwarding = newValue;
+    this.notificationChange.emit(this.notification);
   }
 
   setAssignedUserSuggestions() {
@@ -58,17 +60,17 @@
 
   filterQuery() {
     this.filteredList = this.items.filter((el: any) => {
-      if (this.responsibilityForwarding == null) {
-        return el.name.toLowerCase().indexOf(this.responsibilityForwarding) > -1;
+      if (this.notification.responsibilityForwarding == null) {
+        return el.name.toLowerCase().indexOf(this.notification.responsibilityForwarding) > -1;
       } else {
-        return el.name.toLowerCase().indexOf(this.responsibilityForwarding.toLowerCase()) > -1;
+        return el.name.toLowerCase().indexOf(this.notification.responsibilityForwarding.toLowerCase()) > -1;
       }
     });
   }
 
   filter(event: any) {
 
-    if (this.responsibilityForwarding !== '') {
+    if (this.notification.responsibilityForwarding !== '') {
       if ((event.keyCode >= 48 && event.keyCode <= 57) ||
         (event.keyCode >= 65 && event.keyCode <= 90) ||
         (event.keyCode === 8)) {
@@ -124,9 +126,12 @@
     this.position = -1;
     if (item.name === '') {
       item.name = null;
+      item.uuid = null;
     }
-    this.responsibilityForwarding = item.name;
-    this.responsibilityForwardingChange.emit(item.name);
+
+    this.notification.responsibilityForwarding = item.name;
+    this.notification.responsibilityForwardingUuid = item.uuid;
+    this.notificationChange.emit(this.notification);
   }
 
   @HostListener('keydown', ['$event'])
@@ -147,7 +152,8 @@
   createItemList() {
     this.inputElementList.forEach(element => {
       this.items.push({
-        name: element,
+        name: element.contactName,
+        uuid: element.contactUuid,
         selected: false
       });
     });
diff --git a/src/app/dialogs/entry/entry.component.html b/src/app/dialogs/entry/entry.component.html
index 349b934..740c022 100644
--- a/src/app/dialogs/entry/entry.component.html
+++ b/src/app/dialogs/entry/entry.component.html
@@ -141,7 +141,7 @@
                 <label>Zuständigkeit / weitergeleitet an</label>
               </td>
               <td colspan="2">
-                <app-autocomplete [(responsibilityForwarding)]="notification.responsibilityForwarding"></app-autocomplete>
+                <app-autocomplete [(notification)]="notification"></app-autocomplete>
               </td>
               <td></td>
               <td>
diff --git a/src/app/dialogs/entry/entry.component.spec.ts b/src/app/dialogs/entry/entry.component.spec.ts
index c33d89d..f1c45c3 100644
--- a/src/app/dialogs/entry/entry.component.spec.ts
+++ b/src/app/dialogs/entry/entry.component.spec.ts
@@ -47,8 +47,8 @@
       MockComponent({ selector: 'app-remove-button', inputs: ['nullableAttribute'], outputs: ['nullableAttribute'] }),
       MockComponent({
         selector: 'app-autocomplete',
-        inputs: ['responsibilityForwarding'],
-        outputs: ['responsibilityForwarding']
+        inputs: ['notification'],
+        outputs: ['notification']
       }),
     ];
 
@@ -100,8 +100,8 @@
         MockComponent({ selector: 'input', inputs: ['options'] }),
         MockComponent({
           selector: 'app-autocomplete',
-          inputs: ['responsibilityForwarding'],
-          outputs: ['responsibilityForwarding']
+          inputs: ['notification'],
+          outputs: ['notification']
         }),
         MockComponent({ 
           selector: 'app-remove-button',
diff --git a/src/app/model/contact-tupel.ts b/src/app/model/contact-tupel.ts
new file mode 100644
index 0000000..685d971
--- /dev/null
+++ b/src/app/model/contact-tupel.ts
@@ -0,0 +1,15 @@
+/**
+******************************************************************************
+* Copyright © 2017-2018 PTA GmbH.
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* 
+*     http://www.eclipse.org/legal/epl-v10.html
+* 
+******************************************************************************
+*/
+export class ContactTupel {
+    contactName: string;
+    contactUuid: string;
+}
diff --git a/src/app/model/notification.ts b/src/app/model/notification.ts
index 628630b..6a78081 100644
--- a/src/app/model/notification.ts
+++ b/src/app/model/notification.ts
@@ -24,6 +24,7 @@
     freeText: string;
     freeTextExtended: string;
     responsibilityForwarding: string;
+    responsibilityForwardingUuid: string;
     responsibilityControlPoint: string;
     reminderDate: string;
     futureDate: string;
diff --git a/src/app/pages/search/search.component.html b/src/app/pages/search/search.component.html
index 962b5ec..7619ab8 100644
--- a/src/app/pages/search/search.component.html
+++ b/src/app/pages/search/search.component.html
@@ -60,7 +60,7 @@
                                                     <label>Zuständigkeit / weitergeleitet an</label>
                                                 </td>
                                                 <td colspan="8">
-                                                    <app-autocomplete [(responsibilityForwarding)]="currentSearchFilter.responsibilityForwarding"></app-autocomplete>
+                                                    <app-autocomplete [(notification)]="currentSearchFilter"></app-autocomplete>
                                                 </td>
                                                 <td colspan="2"></td>
                                             </tr>
diff --git a/src/app/pages/search/search.component.spec.ts b/src/app/pages/search/search.component.spec.ts
index 2a66dc3..6c353a1 100644
--- a/src/app/pages/search/search.component.spec.ts
+++ b/src/app/pages/search/search.component.spec.ts
@@ -188,7 +188,7 @@
         }),
         MockComponent({ selector: 'input', inputs: ['options'] }),
         MockComponent({ selector: 'app-search', inputs: ['withCheckboxes', 'withEditButtons', 'isCollapsible'] }),
-        MockComponent({ selector: 'app-autocomplete', inputs: ['responsibilityForwarding'], outputs: ['responsibilityForwarding'] }),
+        MockComponent({ selector: 'app-autocomplete', inputs: ['notification'], outputs: ['notification'] }),
         MockComponent({ selector: 'app-loading-spinner' }),
         AbstractListMocker.getComponentMocks(),
         FinishedNotificationsMocker.getComponentMocks(),
diff --git a/src/app/services/notification.service.ts b/src/app/services/notification.service.ts
index 798fdf6..1056491 100644
--- a/src/app/services/notification.service.ts
+++ b/src/app/services/notification.service.ts
@@ -23,6 +23,7 @@
 import { Notification } from '../model/notification';
 import { FilterSelection } from '../model/filter-selection';
 import { TerritoryResponsibility } from '../model/territory-responsibility';
+import { ContactTupel } from 'app/model/contact-tupel';
 
 @Injectable()
 export class NotificationService extends BaseHttpService {
@@ -69,7 +70,7 @@
       });
   }
 
-  public getAssignedUserSuggestions(): Observable<string[]> {
+  public getAssignedUserSuggestions(): Observable<ContactTupel[]> {
     const headers = new Headers();
     this.createCommonHeaders(headers, this._sessionContext);
     return this._http.get(super.getBaseUrl() + '/assignedUserSuggestions/', { headers: headers })
diff --git a/src/app/test-data/contact-tupel.ts b/src/app/test-data/contact-tupel.ts
new file mode 100644
index 0000000..3126e40
--- /dev/null
+++ b/src/app/test-data/contact-tupel.ts
@@ -0,0 +1,20 @@
+/**
+******************************************************************************
+* Copyright © 2017-2018 PTA GmbH.
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* 
+*     http://www.eclipse.org/legal/epl-v10.html
+* 
+******************************************************************************
+*/
+import { ContactTupel } from 'app/model/contact-tupel';
+
+export const CONTACTTUPEL: ContactTupel[] = [
+    { 'contactName': 'user1', 'contactUuid': 'ec2b74b0-bb46-4b77-bee5-bd621f097bc8'}, 
+    { 'contactName': 'TestUser1', 'contactUuid': 'ec2b74b0-bb46-4b77-bee5-bd621f097bc8'}, 
+    { 'contactName': 'TestUser2', 'contactUuid': 'ec2b74b0-bb46-4b77-bee5-bd621f097bc8'}, 
+    { 'contactName': 'user4', 'contactUuid': 'ec2b74b0-bb46-4b77-bee5-bd621f097bc8'}, 
+    { 'contactName': 'user5', 'contactUuid': 'ec2b74b0-bb46-4b77-bee5-bd621f097bc8'}     
+];
diff --git a/src/app/test-data/notifications.ts b/src/app/test-data/notifications.ts
index fb71f4b..8a86c41 100644
--- a/src/app/test-data/notifications.ts
+++ b/src/app/test-data/notifications.ts
@@ -27,6 +27,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Abteilung 4',
         reminderDate: null,
         futureDate: null,
@@ -57,6 +58,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Abteilung 4',
         reminderDate: null,
         futureDate: null,
@@ -86,6 +88,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Abteilung 4',
         reminderDate: null,
         futureDate: null,
@@ -116,6 +119,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Abteilung 4',
         reminderDate: null,
         futureDate: null,
@@ -145,6 +149,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Abteilung 4',
         reminderDate: null,
         futureDate: null,
@@ -177,6 +182,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Abteilung 4',
         reminderDate: null,
         futureDate: '2017-06-14T11:13:00+01',
@@ -206,6 +212,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Abteilung 4',
         reminderDate: null,
         futureDate: '2017-06-14T14:14:00+01',
@@ -238,6 +245,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Abteilung 4',
         reminderDate: null,
         futureDate: null,
@@ -267,6 +275,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Fachbereich K',
         reminderDate: null,
         futureDate: null,
@@ -296,6 +305,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Firma OPQ',
         reminderDate: null,
         futureDate: null,
@@ -325,6 +335,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Lieferant T',
         reminderDate: null,
         futureDate: null,
@@ -357,6 +368,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: '',
         reminderDate: null,
         futureDate: null,
@@ -386,6 +398,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: '',
         reminderDate: null,
         futureDate: null,
@@ -415,6 +428,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: '',
         reminderDate: null,
         futureDate: null,
@@ -447,6 +461,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: '',
         reminderDate: null,
         futureDate: null,
@@ -476,6 +491,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: '',
         reminderDate: null,
         futureDate: null,
@@ -505,6 +521,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: '',
         reminderDate: null,
         futureDate: null,
diff --git a/src/app/test-data/reminder-notifications.ts b/src/app/test-data/reminder-notifications.ts
index c128bc4..1fef383 100644
--- a/src/app/test-data/reminder-notifications.ts
+++ b/src/app/test-data/reminder-notifications.ts
@@ -27,6 +27,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Abteilung 4',
         reminderDate: '2017-01-16T14:01:001',
         futureDate: null,
@@ -56,6 +57,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Abteilung 4',
         reminderDate: '2017-01-16T14:01:001',
         futureDate: null,
@@ -85,6 +87,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Abteilung 4',
         reminderDate: '2017-01-16T14:01:001',
         futureDate: null,
@@ -115,6 +118,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Abteilung 4',
         reminderDate: '2017-01-16T14:01:001',
         futureDate: null,
@@ -144,6 +148,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Abteilung 4',
         reminderDate: '2017-01-16T14:01:001',
         futureDate: null,
@@ -173,6 +178,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Firma OPQ',
         reminderDate: '2017-01-16T14:01:001',
         futureDate: null,
diff --git a/src/app/test-data/search-result-notifications.ts b/src/app/test-data/search-result-notifications.ts
index 738f70b..77d3360 100644
--- a/src/app/test-data/search-result-notifications.ts
+++ b/src/app/test-data/search-result-notifications.ts
@@ -28,6 +28,7 @@
     freeText: '',
     freeTextExtended: '',
     responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
     responsibilityControlPoint: 'Abteilung 4',
     reminderDate: null,
     futureDate: null,
@@ -59,6 +60,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Abteilung 4',
         reminderDate: null,
         futureDate: null,
@@ -88,6 +90,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Fachbereich K',
         reminderDate: null,
         futureDate: null,
@@ -117,6 +120,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Firma OPQ',
         reminderDate: null,
         futureDate: null,
@@ -149,6 +153,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Abteilung 4',
         reminderDate: null,
         futureDate: null,
@@ -178,6 +183,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Fachbereich K',
         reminderDate: null,
         futureDate: null,
@@ -207,6 +213,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Firma OPQ',
         reminderDate: null,
         futureDate: null,
@@ -236,6 +243,7 @@
         freeText: '',
         freeTextExtended: '',
         responsibilityForwarding: '',
+        responsibilityForwardingUuid: '75d7c3fd-a5f1-4db8-b9b3-84bcb52c9302',
         responsibilityControlPoint: 'Lieferant T',
         reminderDate: null,
         futureDate: null,