Merge pull request #184 from UtrechtUniversity/feature/MSL-612_FrontendFixesForQ4Release

Feature/msl 612 frontend fixes for q4 release

Author: lsamshuijzen

app/Http/Controllers/FrontendController.php

@@ -624,7 +624,7 @@ public function dataPublication($id)
             abort(404, 'ckan request failed');
         }
 
-        return view('frontend.data-publication-detail', ['data' => $result->getResult()]);
+        return view('frontend.data-publication-detail', ['data' => $result->getResult(true)]);
     }
 
     /**

app/Http/Controllers/HomeController.php

@@ -5,7 +5,6 @@
 use App\CkanClient\Client;
 use App\CkanClient\Request\OrganizationListRequest;
 use App\CkanClient\Request\PackageSearchRequest;
-use App\Exports\MappingLogsExport;
 use App\Exports\SurveyExport;
 use App\Jobs\ProcessDatasetDelete;
 use App\Jobs\ProcessImport;
@@ -15,7 +14,6 @@
 use App\Models\DatasetDelete;
 use App\Models\Import;
 use App\Models\Importer;
-use App\Models\MappingLog;
 use App\Models\SourceDataset;
 use App\Models\SourceDatasetIdentifier;
 use App\Models\Surveys\Survey;

app/Models/Ckan/Contributor.php

@@ -36,6 +36,11 @@ public function getFullName(): string
         return $this->msl_contributor_given_name.' '.$this->msl_contributor_family_name;
     }
 
+    public function getAffilitationNames(): array
+    {
+        return array_column($this->affiliations, 'msl_creator_affiliation_name');
+    }
+
     public function addNameIdentifier(NameIdentifier $nameIdentifier): void
     {
         $this->nameIdentifiers[] = $nameIdentifier;

app/Models/Ckan/Creator.php

@@ -33,6 +33,11 @@ public function getFullName(): string
         return $this->msl_creator_given_name.' '.$this->msl_creator_family_name;
     }
 
+    public function getAffilitationNames(): array
+    {
+        return array_column($this->affiliations, 'msl_creator_affiliation_name');
+    }
+
     public function addNameIdentifier(NameIdentifier $nameIdentifier): void
     {
         $this->nameIdentifiers[] = $nameIdentifier;

resources/views/components/list-views/data-publication.blade.php

@@ -2,44 +2,39 @@
     data    = (array)
 --}}
 
-<a class="self-center w-9/12 no-underline" href="{{ route('data-publication-detail', ['id' => $data['id']]) }}">
-
-<div class="hover:bg-secondary-100 ">
-
-
-    <div class="p-4"> 
-        
-        @if (isset( $data['title']))
-            <h4 class="text-left">{{  $data['title'] }}</h4> 
-        @endif
-
-        @if (isset($data['msl_authors']))
-            <h5 class="text-left font-medium pt-4">
-                @foreach ( $data['msl_authors'] as $authorKey => $author )
-                    {{ $author["msl_author_name"] }} 
-                    {{-- a little divider between names --}}
-                    @if (sizeof($data['msl_authors']) -1 != $authorKey )
-                        |
-                    @endif
-                @endforeach
-            </h5>
-        @endif
-
-        @if (isset($data['msl_publication_year']))
-            <p>{{ $data['msl_publication_year'] }}</p>
-        @endif
-
-
-        @if (isset($data['notes']))
-            {{-- https://laravel.com/docs/11.x/strings#method-str-limit --}}
-            <p class="italic ">{{ Str::limit($data['notes'], 295, preserveWords: true) }}</p>
-        @endif
-
-        
-
+<a class="self-center w-9/12 no-underline" href="{{ route('data-publication-detail', ['id' => $data->name]) }}">
+    <div class="hover:bg-secondary-100 ">
+        <div class="p-4">         
+            @if ($data->title != '')
+                <h4 class="text-left">{{  $data->title }}</h4> 
+            @else
+                <h4 class="text-left italic">- no title found -</h4> 
+            @endif
+
+            @if (sizeof($data->msl_creators) > 0)
+                <h5 class="text-left font-medium pt-4">
+                    @foreach ( $data->msl_creators as $authorKey => $author )
+                        {{ $author->getFullName() }} 
+                            @if (sizeof($data->msl_creators) -1 != $authorKey )
+                                |
+                            @endif
+                    @endforeach
+                </h5>
+            @else
+                <h5 class="text-left font-medium pt-4">- no authors found -</h5>
+            @endif
+
+            @if ($data->msl_publication_year != '')
+                <p>{{ $data->msl_publication_year }}</p>
+            @else
+                <p>- no publication year found -</p>
+            @endif
+
+            @if ($data->getMainDescription() != '')
+                <p class="italic ">{{ Str::limit($data->getMainDescription(), 295, preserveWords: true) }}</p>
+            @else
+                <p class="italic ">- no description found -</p>
+            @endif
+        </div>
     </div>
-
-
-</div>    
-
 </a>

resources/views/frontend/data-access.blade.php

@@ -35,7 +35,7 @@
                     <div class="listView">
 
                         {{-- loop list content --}}
-                        @foreach ($result->getResults() as $dataPublication)
+                        @foreach ($result->getResults(true) as $dataPublication)
 
                             @include('components.list-views.data-publication', [
                                 'data' => $dataPublication