Merge pull request #7 from Dion213/CDASH-22

Bugfix

Author: tomcoonen

resources/views/tile.blade.php

@@ -12,9 +12,11 @@
                         <div class="pl-3 pt-1 pb-1 rounded-t-lg flex" style="font-size: 1.4rem; background-color: rgb(0, 82, 204);">
                             <div class="w-5/6">{{$issue["key"]}}</div>
                             @if ($issue['asImg'])
-                            <img class="w-1/6 rounded-full" src="{{$issue["asImg"]}}" style="max-width: 2rem" alt="employee profile picture">
-                            @else
-                                <div class="w-1/6 rounded-full" style="max-width: 2rem">{{ $issue['asInitials'] }}</div>
+                                <img class="w-1/6 rounded-full" src="{{$issue["asImg"]}}" style="max-width: 2rem" alt="employee profile picture">
+                            @elseif (! $issue['asImg'] && $issue['asInitials'])
+                                <div class="flex justify-center items-center rounded-full bg-yellow-500 text-base w-8 h-8">
+                                    <p>{{ $issue['asInitials'] }}</p>
+                                </div>
                             @endif
                         </div>
                         <div class="rounded-b-lg" style="border: 1px solid rgb(0, 82, 204); border-top: 0; color:white;">

src/FetchDataFromJiraCommand.php

@@ -28,15 +28,17 @@ public function handle()
 
         $jiraData = [];
         $i = 0;
-        foreach ($output["issues"] as $issue){
-            $initials = explode(' ', $issue["fields"]["assignee"]["displayName"]);
+        foreach ($output["issues"] as $issue) {
+            $nameArray = explode(' ', $issue["fields"]["assignee"]["displayName"]);
+
+            $initials = substr($nameArray[0], 0, 1).
+                (($nameArray[1] ?? false) ? substr($nameArray[(count($nameArray)-1)], 0, 1) : '');
 
             $jiraData[$i] = [
                 'key' => $issue["key"],
                 'title' => $issue["fields"]["summary"],
-                'prImg' => $issue["fields"]["project"]["avatarUrls"]["48x48"],
                 'asImg' => $issue["fields"]["assignee"]["avatarUrls"]["48x48"] ?? null,
-                'asInitials' => substr($initials[0],0,1).substr($initials[1],0,1),
+                'asInitials' => substr($initials[0],0,1).substr($initials[1],0,1) ?? null,
             ];
             $i++;
         }