Some fixes

src/Netresearch/TimeTrackerBundle/Controller/InterpretationController.php

@@ -26,7 +26,7 @@ protected function mayImpersonate(User $realUser, $simulatedUserId): bool
         if ($realUser->getType() === 'CTL' || $realUser->getType() === 'PL') {
             return true;
         }
-        return in_array($realUser->getUsername(), $serviceUserNames);
+        return parent::mayImpersonate($realUser, $simulatedUserId);
     }
 
     public function sortByName($a, $b)
@@ -128,6 +128,7 @@ public function groupByCustomerAction(Request $request)
 
             if(!isset($customers[$customer])) {
                 $customers[$customer] = array(
+                    'id'  => $customer,
                     'name'  => $entry->getCustomer()->getName(),
                     'hours' => 0,
                     'quota' => 0,
@@ -168,6 +169,7 @@ public function groupByProjectAction(Request $request)
 
             if(!isset($projects[$project])) {
                 $projects[$project] = array(
+                    'id'  => $project,
                     'name'  => $entry->getProject()->getName(),
                     'hours' => 0,
                     'quota' => 0,
@@ -208,6 +210,7 @@ public function groupByTicketAction(Request $request)
             if(!empty($ticket) && $ticket != '-'){
                 if(!isset($tickets[$ticket])) {
                     $tickets[$ticket] = array(
+                        'id'  => $entry->getId(),
                         'name'  => $ticket,
                         'hours' => 0,
                         'quota' => 0,
@@ -257,6 +260,7 @@ public function groupByUserAction(Request $request)
 
             if (!isset($users[$user])) {
                 $users[$user] = array(
+                    'id'  => $user,
                     'name'  => $entry->getUser()->getUsername(),
                     'hours' => 0,
                     'quota' => 0,

src/Netresearch/TimeTrackerBundle/Services/Export.php

@@ -90,7 +90,9 @@ public function getUsername($userId = null)
             $user = $this->container->get('doctrine')
                 ->getRepository('NetresearchTimeTrackerBundle:User')
                 ->find($userId);
-            $username = $user->getUsername();
+            if ($user !== null) {
+                $username = $user->getUsername();
+            }
         }
 
         return $username;

web/api.yml

@@ -1809,6 +1809,10 @@ components:
     ChartDataSuccessResponse:
       type: object
       properties:
+        id:
+          type: integer
+          example: 1
+          description: id of user/customer/projekt/activity
         name:
           type: string
           example: "Kunde1"