Resolve merge with timeline

frontend/app/components/wp-table/timeline/wp-timeline-cell.ts

@@ -28,7 +28,7 @@
 
 import {States} from "../../states.service";
 import {timelineElementCssClass, RenderInfo, calculatePositionValueForDayCount} from "./wp-timeline";
-import {WorkPackageTimelineTableController} from './wp-table-timeline.directive';
+import {WorkPackageTimelineTableController} from './wp-timeline-container.directive';
 import IScope = angular.IScope;
 import WorkPackage = op.WorkPackage;
 import Observable = Rx.Observable;

frontend/app/components/wp-table/timeline/wp-timeline-container.directive.ts

@@ -57,7 +57,6 @@ export class WorkPackageTimelineTableController {
     "ngInject";
 
     $element.on(InteractiveTableController.eventName, () => {
-      console.log("REFRESHING TIMELINE");
       this.refreshView();
     })
   }

frontend/app/components/wp-table/timeline/wp-timeline.dummy-control.directive.ts

@@ -27,7 +27,7 @@
 // ++
 
 import {openprojectModule} from "../../../angular-modules";
-import {WorkPackageTimelineTableController} from './wp-table-timeline.directive';
+import {WorkPackageTimelineTableController} from './wp-timeline-container.directive';
 import {ZoomLevel} from "./wp-timeline";
 import IDirective = angular.IDirective;
 import IScope = angular.IScope;

frontend/app/components/wp-table/wp-row/wp-row.directive.js

@@ -43,7 +43,7 @@ function wpRow(WorkPackagesTableService, wpCacheService, states) {
 
   function buildTimelineCell(scope, element, wpTimelineContainer) {
       // required data for timeline cell
-      var workPackageId = scope.row.object.id;
+      var workPackageId = scope.workPackage.id;
       var timelineTd = element.find(".wp-timeline-cell")[0];
       const timelineCell = new WorkPackagesTimelineCell(
         wpTimelineContainer,
@@ -68,6 +68,8 @@ function wpRow(WorkPackagesTableService, wpCacheService, states) {
 
     require: '^wpTimelineContainer',
     link: function (scope, element, attr, wpTimelineContainer) {
+      scope.workPackage = scope.row.object;
+
       buildTimelineCell(scope, element, wpTimelineContainer);
       setCheckboxTitle(scope);