From 673f118c0ea40731ed2ecc9f9f1382a279755471 Mon Sep 17 00:00:00 2001
From: "create-issue-branch[bot]"
 <53036503+create-issue-branch[bot]@users.noreply.github.com>
Date: Tue, 16 Jul 2024 12:35:32 +0000
Subject: [PATCH 1/6] Create draft PR for #498 [skip ci]


From 74401ea4327f0bdc111cbb76ae8cd2d34d049c73 Mon Sep 17 00:00:00 2001
From: rebeccadjim <rebecca.djimtoingar-taroum@insa-lyon.fr>
Date: Fri, 19 Jul 2024 10:38:49 +0200
Subject: [PATCH 2/6] feat(Links): creation of relation from refugee to event

---
 src/app/Http/Controllers/LinkController.php | 31 +++++++++++++--
 src/app/Models/Event.php                    | 16 ++++++++
 src/app/Models/Link.php                     | 23 +++++++++--
 src/app/Models/Place.php                    | 16 ++++++++
 src/resources/views/links/create.blade.php  |  4 +-
 src/resources/views/links/index.blade.php   | 43 ++++++++++++++-------
 6 files changed, 112 insertions(+), 21 deletions(-)

diff --git a/src/app/Http/Controllers/LinkController.php b/src/app/Http/Controllers/LinkController.php
index 0738a208f..7a69c7375 100644
--- a/src/app/Http/Controllers/LinkController.php
+++ b/src/app/Http/Controllers/LinkController.php
@@ -13,6 +13,8 @@
 use App\Models\ListRelation;
 use App\Models\ListRelationType;
 use App\Models\Refugee;
+use App\Models\Event;
+use App\Models\Place;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Auth;
@@ -89,11 +91,29 @@ public function update(UpdateLinkRequest $request,Link $link) {
      * @return Response
      */
     public function index() {
-        $links = Link::whereRelation('RefugeeFrom.crew',
+        $links_refugee_to_refugee = Link::whereRelation('RefugeeFrom.crew',
             'crews.id',
             Auth::user()->crew->id)->whereRelation('RefugeeTo.crew',
             'crews.id',
             Auth::user()->crew->id)->get();
+        $links_refugee_to_event = Link::whereRelation('RefugeeFrom.crew',
+            'crews.id',
+            Auth::user()->crew->id)->whereRelation('EventTo.crew',
+            'crews.id',
+            Auth::user()->crew->id)->get();
+        $links_event_to_refugee = Link::whereRelation('EventFrom.crew',
+            'crews.id',
+            Auth::user()->crew->id)->whereRelation('RefugeeTo.crew',
+            'crews.id',
+            Auth::user()->crew->id)->get();
+        $links_event_to_event = Link::whereRelation('EventFrom.crew',
+            'crews.id',
+            Auth::user()->crew->id)->whereRelation('EventTo.crew',
+            'crews.id',
+            Auth::user()->crew->id)->get();
+
+        // merge all links
+        $links = $links_refugee_to_refugee->merge($links_refugee_to_event)->merge($links_event_to_refugee)->merge($links_event_to_event);
         return view("links.index",
             compact('links'));
     }
@@ -172,8 +192,11 @@ public function store(StoreLinkRequest $request) {
      * @return Response
      */
     public function create($origin = null,
-        Refugee $refugee = null) {
+        Refugee $refugee = null, Event $event = null, Place $place = null) {
         $lists["refugees"] = Refugee::getAllBestDescriptiveValues();
+        $lists["events"] = Event::getAllEventsNames();
+        $lists["places"] = Place::getAllPlacesNames();
+        $lists["all"] = $lists["refugees"] + $lists["events"] + $lists["places"];
         $lists["relations"] = array_column(ListRelation::all()->toArray(),
             ListControl::where('name',
                 "ListRelation")->first()->displayed_value,
@@ -181,7 +204,9 @@ public function create($origin = null,
         return view("links.create",
             compact("lists",
                 'origin',
-                'refugee'));
+                'refugee',
+            'event',
+            'place'));
     }
 
     /**
diff --git a/src/app/Models/Event.php b/src/app/Models/Event.php
index 66b01d0c2..3eb92d6f5 100644
--- a/src/app/Models/Event.php
+++ b/src/app/Models/Event.php
@@ -61,4 +61,20 @@ public function persons()
         }
         return $persons_in_event;
     }
+
+    public static function getAllEventsNames(){
+        $events = Event::all();
+        $events_name = [];
+        foreach ($events as $event){
+            $events_name[$event->id] = $event->name;
+        }
+        return $events_name;
+    }
+    public function crew() {
+        return $this->hasOneThrough(Crew::class,
+            ApiLog::class,
+            "id", "id",
+            "api_log",
+            "crew_id");
+    }
 }
diff --git a/src/app/Models/Link.php b/src/app/Models/Link.php
index 4e4ed4c07..3b9b31177 100644
--- a/src/app/Models/Link.php
+++ b/src/app/Models/Link.php
@@ -122,6 +122,25 @@ public function refugeeTo() {
             "to");
     }
 
+    public function eventFrom() {
+        return $this->belongsTo(Event::class,
+            "from");
+    }
+    public function eventTo() {
+        return $this->belongsTo(Event::class,
+            "to");
+    }
+
+    public function placeFrom() {
+        return $this->belongsTo(Place::class,
+            "from");
+    }
+
+    public function placeTo() {
+        return $this->belongsTo(Place::class,
+            "to");
+    }
+
     /**
      * @return BelongsTo
      */
@@ -137,8 +156,6 @@ public function crew() {
             "crew_id");
     }
 
-
-
     /**
      * Get from Id
      * @return mixed
@@ -182,5 +199,5 @@ public function setRelationAttribute($value) {
     public function getDateAttribute() {
         return Carbon::parse($this->attributes['date']);
     }
-    
+
 }
diff --git a/src/app/Models/Place.php b/src/app/Models/Place.php
index bff174ba6..b8c35033e 100644
--- a/src/app/Models/Place.php
+++ b/src/app/Models/Place.php
@@ -45,4 +45,20 @@ class Place extends Model
      * @var array
      */
     protected $dates = ['deleted_at'];
+
+    public static function getAllPlacesNames() {
+        $places = self::all();
+        $places_names = [];
+        foreach ($places as $place) {
+            $places_names[$place->id] = $place->name;
+        }
+        return $places_names;
+    }
+    public function crew() {
+        return $this->hasOneThrough(Crew::class,
+            ApiLog::class,
+            "id", "id",
+            "api_log",
+            "crew_id");
+    }
 }
diff --git a/src/resources/views/links/create.blade.php b/src/resources/views/links/create.blade.php
index e599fdfb5..1da679866 100644
--- a/src/resources/views/links/create.blade.php
+++ b/src/resources/views/links/create.blade.php
@@ -28,7 +28,7 @@ class="bg-gray-200 hover:bg-gray-300 text-black font-bold py-2 px-4 rounded">{{
                             'type' => 'select-dropdown',
                             'title' => __('links/create.item_1'),
                             'placeHolder' => __('links/create.select_item_1'),
-                            'associated_list' => $lists["refugees"],
+                            'associated_list' => $lists["all"],
                             'previous' => old($form_elem, $selected_value = (!empty($refugee) && !empty($origin) &&
                             $origin == "from") ? $refugee->id : $form_elem),
                             ])
@@ -81,7 +81,7 @@ class="bg-gray-200 hover:bg-gray-300 text-black font-bold py-2 px-4 rounded">{{
                             'type' => 'select-dropdown',
                             'title' => __('links/create.item_2'),
                             'placeHolder' => __('links/create.select_item_2'),
-                            'associated_list' => $lists["refugees"],
+                            'associated_list' => $lists["all"],
                             'previous' => old($form_elem, (!empty($refugee) && !empty($origin) && $origin == "to") ?
                             $refugee->id : $form_elem ),
                             ])
diff --git a/src/resources/views/links/index.blade.php b/src/resources/views/links/index.blade.php
index e4cc2df0d..4d2084e0b 100644
--- a/src/resources/views/links/index.blade.php
+++ b/src/resources/views/links/index.blade.php
@@ -48,19 +48,36 @@ class="bg-green-500 hover:bg-green-700 text-white font-bold py-2 px-4 rounded">
                                 </thead>
                                 <tbody>
                                 @foreach($links as $link)
-                                    <tr>
-                                        <td>
-                                            <a href="{{route('person.show',  $link->refugeeFrom->id)}}"> {{ $link->refugeeFrom->best_descriptive_value }}</a>
-                                        </td>
-                                        <td>{{ $link->relation->displayed_value_content }}</td>
-                                        <td>
-                                            <a href="{{route('person.show',  $link->refugeeTo->id)}}"> {{ $link->refugeeTo->best_descriptive_value }}</a>
-                                        </td>
-                                        <td>{{ $link->date->format('d/m/Y') }}</td>
-                                        @can('update', $link)
-                                            <td><a href="{{route('links.edit',  $link->id)}}">{{ __('common.edit') }}</a></td>
-                                        @endcan
-                                    </tr>
+                                    @if (($link->refugeeFrom) && ($link->refugeeTo))
+                                        <tr>
+                                            <td>
+                                                <a href="{{route('person.show',  $link->refugeeFrom->id)}}"> {{ $link->refugeeFrom->best_descriptive_value }}</a>
+                                            </td>
+                                            <td>{{ $link->relation->displayed_value_content }}</td>
+                                            <td>
+                                                <a href="{{route('person.show',  $link->refugeeTo->id)}}"> {{ $link->refugeeTo->best_descriptive_value }}</a>
+                                            </td>
+                                            <td>{{ $link->date->format('d/m/Y') }}</td>
+                                            @can('update', $link)
+                                                <td><a href="{{route('links.edit',  $link->id)}}">{{ __('common.edit') }}</a></td>
+                                            @endcan
+                                        </tr>
+                                    @endif
+                                    @if (($link->refugeeFrom) && ($link->EventTo))
+                                        <tr>
+                                            <td>
+                                                <a href="{{route('person.show',  $link->refugeeFrom->id)}}"> {{ $link->refugeeFrom->best_descriptive_value }}</a>
+                                            </td>
+                                            <td>{{ $link->relation->displayed_value_content }}</td>
+                                            <td>
+                                                <a href="{{route('person.show',  $link->EventTo->id)}}"> {{ $link->EventTo->name }}</a>
+                                            </td>
+                                            <td>{{ $link->date->format('d/m/Y') }}</td>
+                                            @can('update', $link)
+                                                <td><a href="{{route('links.edit',  $link->id)}}">{{ __('common.edit') }}</a></td>
+                                            @endcan
+                                        </tr>
+                                    @endif
                                 @endforeach
                                 </tbody>
                             </table>

From 05fca0c986db0235011336ccf38e34065d43d52b Mon Sep 17 00:00:00 2001
From: rebeccadjim <rebecca.djimtoingar-taroum@insa-lyon.fr>
Date: Fri, 26 Jul 2024 10:14:39 -0300
Subject: [PATCH 3/6] feat(Links):all links are now functioning and viewable

---
 src/app/Http/Controllers/EventController.php |  1 +
 src/app/Http/Controllers/LinkController.php  | 48 ++++++++++----------
 src/app/Http/Controllers/PlaceController.php |  3 ++
 src/app/Models/Link.php                      |  7 +++
 src/app/Models/Place.php                     |  7 ++-
 src/resources/views/links/create.blade.php   |  2 +-
 src/resources/views/links/index.blade.php    | 48 ++++++++++++--------
 7 files changed, 71 insertions(+), 45 deletions(-)

diff --git a/src/app/Http/Controllers/EventController.php b/src/app/Http/Controllers/EventController.php
index 32bc9dbf1..cf30ebdc3 100644
--- a/src/app/Http/Controllers/EventController.php
+++ b/src/app/Http/Controllers/EventController.php
@@ -71,6 +71,7 @@ public function store(StoreEventRequest $request)
      */
     public function show(Event $event)
     {
+        dd($event);
         return view("event.show", compact("event"));
     }
 
diff --git a/src/app/Http/Controllers/LinkController.php b/src/app/Http/Controllers/LinkController.php
index 7a69c7375..7ed56385c 100644
--- a/src/app/Http/Controllers/LinkController.php
+++ b/src/app/Http/Controllers/LinkController.php
@@ -56,7 +56,7 @@ public static function handleApiRequest(StoreLinkApiRequest $request) {
                     $link = Link::firstOrCreate($link, ["api_log" => $log->id]);
 
                 }
-                array_push($responseArray, $link->id);
+                array_push ($responseArray, $link->id);
             }
             return response(json_encode($responseArray),
                 201,
@@ -90,32 +90,32 @@ public function update(UpdateLinkRequest $request,Link $link) {
      *
      * @return Response
      */
+
     public function index() {
-        $links_refugee_to_refugee = Link::whereRelation('RefugeeFrom.crew',
-            'crews.id',
-            Auth::user()->crew->id)->whereRelation('RefugeeTo.crew',
-            'crews.id',
-            Auth::user()->crew->id)->get();
-        $links_refugee_to_event = Link::whereRelation('RefugeeFrom.crew',
-            'crews.id',
-            Auth::user()->crew->id)->whereRelation('EventTo.crew',
-            'crews.id',
-            Auth::user()->crew->id)->get();
-        $links_event_to_refugee = Link::whereRelation('EventFrom.crew',
-            'crews.id',
-            Auth::user()->crew->id)->whereRelation('RefugeeTo.crew',
-            'crews.id',
-            Auth::user()->crew->id)->get();
-        $links_event_to_event = Link::whereRelation('EventFrom.crew',
-            'crews.id',
-            Auth::user()->crew->id)->whereRelation('EventTo.crew',
-            'crews.id',
-            Auth::user()->crew->id)->get();
+
+        $links_refugee_to_refugee = Link::createLinks('RefugeeFrom', 'RefugeeTo');
+        $links_refugee_to_event = Link::createLinks('RefugeeFrom', 'EventTo');
+        $links_refugee_to_place = Link::createLinks('RefugeeFrom', 'PlaceTo');
+        $links_event_to_refugee = Link::createLinks('EventFrom', 'RefugeeTo');
+        $links_event_to_event = Link::createLinks('EventFrom', 'EventTo');
+        $links_event_to_place = Link::createLinks('EventFrom', 'PlaceTo');
+        $links_place_to_place = Link::createLinks('PlaceFrom', 'PlaceTo');
+        $links_place_to_refugee = Link::createLinks('PlaceFrom', 'RefugeeTo');
+        $links_place_to_event = Link::createLinks('PlaceFrom', 'EventTo');
+
 
         // merge all links
-        $links = $links_refugee_to_refugee->merge($links_refugee_to_event)->merge($links_event_to_refugee)->merge($links_event_to_event);
-        return view("links.index",
-            compact('links'));
+        $links = $links_refugee_to_refugee
+            ->merge($links_refugee_to_event)
+            ->merge($links_refugee_to_place)
+            ->merge($links_event_to_refugee)
+            ->merge($links_event_to_event)
+            ->merge($links_event_to_place)
+            ->merge($links_place_to_place)
+            ->merge($links_place_to_refugee)
+            ->merge($links_place_to_event);
+
+        return view("links.index", compact('links'));
     }
 
     /**
diff --git a/src/app/Http/Controllers/PlaceController.php b/src/app/Http/Controllers/PlaceController.php
index 35866ad75..30e98ad9f 100644
--- a/src/app/Http/Controllers/PlaceController.php
+++ b/src/app/Http/Controllers/PlaceController.php
@@ -7,6 +7,7 @@
 use App\Models\Place;
 use \App\Http\Livewire\Forms\Coordinates;
 use \App\Http\Livewire\Forms\Area;
+use App\Models\ApiLog;
 
 class PlaceController extends Controller
 {
@@ -37,7 +38,9 @@ public function create()
 
     public function store(StorePlaceRequest $request)
     {
+        $log = ApiLog::createFromRequest($request, 'Place');
         $place = $request->validated();
+        $place['api_log'] = $log->id;
         $place['coordinates'] = Coordinates::encode($place['coordinates']);
         $place['area'] = Area::encode($place['area']);
         $place = Place::create($place);
diff --git a/src/app/Models/Link.php b/src/app/Models/Link.php
index 3b9b31177..46cf6fc62 100644
--- a/src/app/Models/Link.php
+++ b/src/app/Models/Link.php
@@ -9,6 +9,7 @@
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\Pivot;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Facades\Auth;
 
 
 class Link extends Pivot
@@ -141,6 +142,12 @@ public function placeTo() {
             "to");
     }
 
+    public static function createLinks($relationFrom, $relationTo) {
+        return self::whereRelation("$relationFrom.crew", 'crews.id', Auth::user()->crew->id)
+            ->whereRelation("$relationTo.crew", 'crews.id', Auth::user()->crew->id)
+            ->get();
+    }
+
     /**
      * @return BelongsTo
      */
diff --git a/src/app/Models/Place.php b/src/app/Models/Place.php
index b8c35033e..226606ea7 100644
--- a/src/app/Models/Place.php
+++ b/src/app/Models/Place.php
@@ -37,7 +37,7 @@ class Place extends Model
      *
      * @var array
      */
-    protected $fillable = ['name', 'coordinates', 'description', 'area'];
+    protected $fillable = ['name', 'coordinates', 'description', 'area', 'api_log'];
 
     /**
      * The attributes that should be mutated to dates.
@@ -46,6 +46,11 @@ class Place extends Model
      */
     protected $dates = ['deleted_at'];
 
+    public function api_log()
+    {
+        return $this->hasOne(ApiLog::class, 'id', 'apiLog_id');
+    }
+
     public static function getAllPlacesNames() {
         $places = self::all();
         $places_names = [];
diff --git a/src/resources/views/links/create.blade.php b/src/resources/views/links/create.blade.php
index 1da679866..918c2c5f0 100644
--- a/src/resources/views/links/create.blade.php
+++ b/src/resources/views/links/create.blade.php
@@ -43,6 +43,7 @@ class="bg-gray-200 hover:bg-gray-300 text-black font-bold py-2 px-4 rounded">{{
 
                         <div class="row pl-4 pr-4 bg-white">
                             <div class="col-8 bg-white sm:p-6">
+
                                 <!--  Relation SECTION  -->
 
                                 @php($form_elem = "relation_id")
@@ -113,7 +114,6 @@ class="bg-gray-200 hover:bg-gray-300 text-black font-bold py-2 px-4 rounded">{{
                             ])
                         </div>
 
-
                         <div class="flex items-center justify-end px-4 py-3 bg-gray-50 text-right sm:px-6">
                             <button class="inline-flex items-center px-4 py-2 bg-gray-800 border border-transparent rounded-md font-semibold text-xs text-white uppercase tracking-widest hover:bg-gray-700 active:bg-gray-900 focus:outline-none focus:border-gray-900 focus:shadow-outline-gray disabled:opacity-25 transition ease-in-out duration-150">
                                 {{ __('common.save') }}
diff --git a/src/resources/views/links/index.blade.php b/src/resources/views/links/index.blade.php
index 4d2084e0b..4ddafab24 100644
--- a/src/resources/views/links/index.blade.php
+++ b/src/resources/views/links/index.blade.php
@@ -48,33 +48,43 @@ class="bg-green-500 hover:bg-green-700 text-white font-bold py-2 px-4 rounded">
                                 </thead>
                                 <tbody>
                                 @foreach($links as $link)
-                                    @if (($link->refugeeFrom) && ($link->refugeeTo))
-                                        <tr>
-                                            <td>
-                                                <a href="{{route('person.show',  $link->refugeeFrom->id)}}"> {{ $link->refugeeFrom->best_descriptive_value }}</a>
-                                            </td>
-                                            <td>{{ $link->relation->displayed_value_content }}</td>
-                                            <td>
-                                                <a href="{{route('person.show',  $link->refugeeTo->id)}}"> {{ $link->refugeeTo->best_descriptive_value }}</a>
-                                            </td>
-                                            <td>{{ $link->date->format('d/m/Y') }}</td>
-                                            @can('update', $link)
-                                                <td><a href="{{route('links.edit',  $link->id)}}">{{ __('common.edit') }}</a></td>
-                                            @endcan
-                                        </tr>
-                                    @endif
-                                    @if (($link->refugeeFrom) && ($link->EventTo))
+                                    @php
+                                        $types = [
+                                            'refugeeFrom' => 'person',
+                                            'refugeeTo' => 'person',
+                                            'eventFrom' => 'event',
+                                            'eventTo' => 'event',
+                                            'placeFrom' => 'place',
+                                            'placeTo' => 'place',
+                                        ];
+                                        $fromType = null;
+                                        $toType = null;
+                                        $from = null;
+                                        $to = null;
+
+                                        foreach ($types as $relation => $route) {
+                                            if ($link->$relation && !$from) {
+                                                $from = $link->$relation;
+                                                $fromType = $route;
+                                            } elseif ($link->$relation && !$to) {
+                                                $to = $link->$relation;
+                                                $toType = $route;
+                                            }
+                                        }
+                                    @endphp
+
+                                    @if ($from && $to)
                                         <tr>
                                             <td>
-                                                <a href="{{route('person.show',  $link->refugeeFrom->id)}}"> {{ $link->refugeeFrom->best_descriptive_value }}</a>
+                                                <a href="{{ route($fromType . '.show', $from->id) }}">{{ $from->best_descriptive_value ?? $from->name }}</a>
                                             </td>
                                             <td>{{ $link->relation->displayed_value_content }}</td>
                                             <td>
-                                                <a href="{{route('person.show',  $link->EventTo->id)}}"> {{ $link->EventTo->name }}</a>
+                                                <a href="{{ route($toType . '.show', $to->id) }}">{{ $to->best_descriptive_value ?? $to->name }}</a>
                                             </td>
                                             <td>{{ $link->date->format('d/m/Y') }}</td>
                                             @can('update', $link)
-                                                <td><a href="{{route('links.edit',  $link->id)}}">{{ __('common.edit') }}</a></td>
+                                                <td><a href="{{ route('links.edit', $link->id) }}">{{ __('common.edit') }}</a></td>
                                             @endcan
                                         </tr>
                                     @endif

From 7da6ea8445bd8e68d431f3bc113d7fbc0ccf0f1c Mon Sep 17 00:00:00 2001
From: rebeccadjim <rebecca.djimtoingar-taroum@insa-lyon.fr>
Date: Fri, 26 Jul 2024 10:38:32 -0300
Subject: [PATCH 4/6] feat(Links):views of links and person were adapted to
 changes, migration was done for api_log in place

---
 ...024_07_19_091627_add_api_log_to_places.php | 32 +++++++++++++++++++
 src/resources/lang/en/person/show.php         |  1 +
 src/resources/views/links/edit.blade.php      |  8 +++--
 src/resources/views/person/show.blade.php     | 16 ++++++++--
 4 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100755 src/database/migrations/2024_07_19_091627_add_api_log_to_places.php

diff --git a/src/database/migrations/2024_07_19_091627_add_api_log_to_places.php b/src/database/migrations/2024_07_19_091627_add_api_log_to_places.php
new file mode 100755
index 000000000..9712afdbe
--- /dev/null
+++ b/src/database/migrations/2024_07_19_091627_add_api_log_to_places.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('places', function (Blueprint $table) {
+            $table->foreignUuid("api_log");
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('places', function (Blueprint $table) {
+            $table->dropColumn('api_log');
+        });
+    }
+};
diff --git a/src/resources/lang/en/person/show.php b/src/resources/lang/en/person/show.php
index 054711d36..9ee661d4a 100644
--- a/src/resources/lang/en/person/show.php
+++ b/src/resources/lang/en/person/show.php
@@ -13,4 +13,5 @@
     'to' => 'To',
     'add_to' => 'Add To',
     'add_from' => 'Add from',
+    'edit'=> 'Edit',
 ];
diff --git a/src/resources/views/links/edit.blade.php b/src/resources/views/links/edit.blade.php
index 0d2de6dbe..3768e26d5 100644
--- a/src/resources/views/links/edit.blade.php
+++ b/src/resources/views/links/edit.blade.php
@@ -1,9 +1,13 @@
 @php use App\Models\ListRelation; @endphp
-@section('title', __('links/edit.edit_relation_between', ['item' => $link->refugeeFrom->best_descriptive_value, 'item2' => $link->refugeeTo->best_descriptive_value]))
+@section('title', __('links/edit.edit_relation_between', [
+    'item' => $link->refugeeFrom->best_descriptive_value ?? $link->eventFrom->name ?? $link->placeFrom->name,
+    'item2' => $link->refugeeTo->best_descriptive_value ?? $link->eventTo->name ?? $link->placeTo->name
+]))
 <x-app-layout>
     <x-slot name="header">
         <h2 class="font-semibold text-xl text-gray-800 leading-tight">
-            {{ __('links/edit.edit_relation_between', ['item' => $link->refugeeFrom->best_descriptive_value, 'item2' => $link->refugeeTo->best_descriptive_value]) }}
+            {{ __('links/edit.edit_relation_between', ['item' => $link->refugeeFrom->best_descriptive_value ?? $link->eventFrom->name ?? $link->placeFrom->name,
+    'item2' => $link->refugeeTo->best_descriptive_value ?? $link->eventTo->name ?? $link->placeTo->name]) }}
         </h2>
     </x-slot>
 
diff --git a/src/resources/views/person/show.blade.php b/src/resources/views/person/show.blade.php
index 391b47628..7ce9c9227 100644
--- a/src/resources/views/person/show.blade.php
+++ b/src/resources/views/person/show.blade.php
@@ -115,7 +115,13 @@ class="bg-gray-200 hover:bg-gray-300 hover:text-black text-black
                                                 <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900
                                                 bg-white divide-y divide-gray-200">
                                                     <a href="{{route("person.show", $link->pivot->from)}}">
-                                                        {{$link->pivot->refugeeFrom->best_descriptive_value }}
+                                                        @if($link->pivot->refugeeFrom)
+                                                            {{$link->pivot->refugeeFrom->best_descriptive_value }}
+                                                            @elseif($link->pivot->eventFrom)
+                                                            {{$link->pivot->eventFrom->name}}
+                                                            @elseif($link->pivot->placeFrom)
+                                                            {{$link->pivot->placeFrom->name}}
+                                                        @endif
                                                     </a>
                                                 </td>
                                                 <td class="px-6 py-4 whitespace-nowrap text-sm
@@ -126,7 +132,13 @@ class="bg-gray-200 hover:bg-gray-300 hover:text-black text-black
                                                 <td class="px-6 py-4 whitespace-nowrap text-sm
                                                 text-gray-900 bg-white divide-y divide-gray-200">
                                                     <a href="{{route("person.show", $link->pivot->to)}}">
-                                                        {{ $link->pivot->refugeeTo->best_descriptive_value }}
+                                                        @if($link->pivot->refugeeTo)
+                                                            {{$link->pivot->refugeeTo->best_descriptive_value }}
+                                                            @elseif($link->pivot->eventTo)
+                                                            {{$link->pivot->eventTo->name}}
+                                                            @elseif($link->pivot->placeTo)
+                                                            {{$link->pivot->placeTo->name}}
+                                                        @endif
                                                     </a>
                                                 </td>
                                                 <td class="px-6 py-4 whitespace-nowrap text-sm

From 2e191494ada4a24029008518ca4d28f886721ab6 Mon Sep 17 00:00:00 2001
From: rebeccadjim <rebecca.djimtoingar-taroum@insa-lyon.fr>
Date: Thu, 1 Aug 2024 18:27:41 -0300
Subject: [PATCH 5/6] feat(Links):links with event and place are now visible on
 Cytoscape

---
 .../Http/Controllers/CytoscapeController.php  | 57 +++++++++++++++++--
 src/app/Models/Event.php                      |  7 +++
 src/database/factories/PlaceFactory.php       | 12 ++++
 3 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/src/app/Http/Controllers/CytoscapeController.php b/src/app/Http/Controllers/CytoscapeController.php
index 007a29d51..8e5a158fc 100644
--- a/src/app/Http/Controllers/CytoscapeController.php
+++ b/src/app/Http/Controllers/CytoscapeController.php
@@ -26,32 +26,77 @@ public function index()
         $lists = Field::whereCrewId(Auth::user()->crew_id)->whereRelation('dataType','name', 'List')->get();
         $lists_name = $lists->pluck('title', 'id');
         $field_list = json_encode($lists->pluck('linked_list','id'));
-        $relations = Link::whereRelation('RefugeeFrom.crew', 'crews.id', Auth::user()->crew->id)
+        $refugee_to_event_relations = Link::whereRelation('RefugeeFrom.crew', 'crews.id', Auth::user()->crew->id)
+            ->whereRelation('EventTo.crew', 'crews.id', Auth::user()->crew->id)
+            ->get();
+        $refugee_to_place_relations = Link::whereRelation('RefugeeFrom.crew', 'crews.id', Auth::user()->crew->id)
+            ->whereRelation('PlaceTo.crew', 'crews.id', Auth::user()->crew->id)
+            ->get();
+        $refugee_to_refugee_relations = Link::whereRelation('RefugeeFrom.crew', 'crews.id', Auth::user()->crew->id)
+            ->whereRelation('RefugeeTo.crew', 'crews.id', Auth::user()->crew->id)
+            ->get();
+        $event_to_event_relations = Link::whereRelation('EventFrom.crew', 'crews.id', Auth::user()->crew->id)
+            ->whereRelation('EventTo.crew', 'crews.id', Auth::user()->crew->id)
+            ->get();
+        $event_to_place_relations = Link::whereRelation('EventFrom.crew', 'crews.id', Auth::user()->crew->id)
+            ->whereRelation('PlaceTo.crew', 'crews.id', Auth::user()->crew->id)
+            ->get();
+        $event_to_refugee_relations = Link::whereRelation('EventFrom.crew', 'crews.id', Auth::user()->crew->id)
             ->whereRelation('RefugeeTo.crew', 'crews.id', Auth::user()->crew->id)
             ->get();
+        $place_to_place_relations = Link::whereRelation('PlaceFrom.crew', 'crews.id', Auth::user()->crew->id)
+            ->whereRelation('PlaceTo.crew', 'crews.id', Auth::user()->crew->id)
+            ->get();
+        $place_to_refugee_relations = Link::whereRelation('PlaceFrom.crew', 'crews.id', Auth::user()->crew->id)
+            ->whereRelation('RefugeeTo.crew', 'crews.id', Auth::user()->crew->id)
+            ->get();
+        $place_to_event_relations = Link::whereRelation('PlaceFrom.crew', 'crews.id', Auth::user()->crew->id)
+            ->whereRelation('EventTo.crew', 'crews.id', Auth::user()->crew->id)
+            ->get();
+        $relations = $refugee_to_event_relations
+            ->merge($refugee_to_place_relations)
+            ->merge($refugee_to_refugee_relations)
+            ->merge($event_to_event_relations)
+            ->merge($event_to_place_relations)
+            ->merge($event_to_refugee_relations)
+            ->merge($place_to_place_relations)
+            ->merge($place_to_refugee_relations)
+            ->merge($place_to_event_relations);
 
         //get the role field
 
         $links = array();
         $nodes = array();
         $refugees = array();
+        $events = array();
+        $places = array();
         $used_relations = array();
         foreach ($relations as $relation) {
 
             $node["data"] = array();
             $node["data"]["id"] = $relation->getFromId();
-            $node["data"]["name"] = $relation->refugeeFrom->best_descriptive_value;
+            $node["data"]["name"] = $relation->refugeeFrom?->best_descriptive_value
+                ?? $relation->eventFrom?->name
+                ?? $relation->placeFrom?->name
+                ?? "Ø";
 
             array_push($nodes, $node);
 
             $node["data"] = array();
             $node["data"]["id"] = $relation->getToId();
-            $node["data"]["name"] = $relation->refugeeTo->best_descriptive_value;
+            $node["data"]["name"] = $relation->refugeeTo?->best_descriptive_value
+                ?? $relation->eventTo?->name
+                ?? $relation->placeTo?->name
+                ?? "Ø";
 
             array_push($nodes, $node);
 
-            $refugees[$relation->getToId()] = $relation->refugeeTo->best_descriptive_value;
-            $refugees[$relation->getFromId()] = $relation->refugeeFrom->best_descriptive_value;
+            $refugees[$relation->getToId()] = $relation->refugeeTo->best_descriptive_value ?? "Ø";
+            $refugees[$relation->getFromId()] = $relation->refugeeFrom->best_descriptive_value ?? "Ø";
+            $events[$relation->getToId()] = $relation->eventTo->name ?? "Ø";
+            $events[$relation->getFromId()] = $relation->eventFrom->name ?? "Ø";
+            $places[$relation->getToId()] = $relation->placeTo->name ?? "Ø";
+            $places[$relation->getFromId()] = $relation->placeFrom->name ?? "Ø";
 
             $link["data"] = array();
             $link["data"]["id"] = $relation->id;
@@ -103,6 +148,6 @@ public function index()
 
         // file_put_contents("js/cytoscape/content.json",json_encode(array_merge($nodes, $links)));
         Storage::disk('public')->put('content.json', $cytoscape_data);
-        return view("cytoscape.index", compact("relations", "refugees", "lists_name", "field_list", "persons", "used_relations"));
+        return view("cytoscape.index", compact("relations", "refugees", "events", "places","lists_name", "field_list", "persons", "used_relations"));
     }
 }
diff --git a/src/app/Models/Event.php b/src/app/Models/Event.php
index 3eb92d6f5..be9f0ff51 100644
--- a/src/app/Models/Event.php
+++ b/src/app/Models/Event.php
@@ -77,4 +77,11 @@ public function crew() {
             "api_log",
             "crew_id");
     }
+    public function user() {
+        return $this->hasOneThrough(User::class,
+            ApiLog::class,
+            "id", "id",
+            "api_log",
+            "user_id");
+    }
 }
diff --git a/src/database/factories/PlaceFactory.php b/src/database/factories/PlaceFactory.php
index dd96a4b43..58413eb5b 100644
--- a/src/database/factories/PlaceFactory.php
+++ b/src/database/factories/PlaceFactory.php
@@ -4,6 +4,8 @@
 
 use App\Models\Place;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use App\Models\ApiLog;
+use App\Models\User;
 
 class PlaceFactory extends Factory
 {
@@ -11,6 +13,15 @@ class PlaceFactory extends Factory
 
     public function definition(): array
     {
+        $log["user_id"] = User::where("email", env("DEFAULT_EMAIL"))->first()->id;
+        $log["application_id"] = "seeder";
+        $log["api_type"] = "seeder";
+        $log["http_method"] = "POST";
+        $log["model"] = "Event";
+        $log["ip"] = "127.0.0.1";
+        $log["crew_id"] = User::where("email", env("DEFAULT_EMAIL"))->first()->crew->id;
+
+        $log = ApiLog::create($log);
 
         $coordinates = json_encode([
             "lat" => $this->faker->latitude,
@@ -34,6 +45,7 @@ public function definition(): array
             "coordinates" => $coordinates,
             "description" => $this->faker->realText,
             "area" => $area,
+            "api_log" => $log->id,
         ];
     }
 }

From 0d7af61b8a1e6fe1442975c322dd57a88c2571b7 Mon Sep 17 00:00:00 2001
From: rebeccadjim <rebecca.djimtoingar-taroum@insa-lyon.fr>
Date: Wed, 7 Aug 2024 16:46:11 -0300
Subject: [PATCH 6/6] feat(Links):Links between the three models are now
 visible

---
 src/app/Http/Controllers/EventController.php |   3 +-
 src/app/Models/Event.php                     |  16 ++
 src/app/Models/Link.php                      |  97 +++++++---
 src/app/Models/Place.php                     |  11 ++
 src/resources/lang/en/event/show.php         |  11 +-
 src/resources/lang/en/place/show.php         |   9 +
 src/resources/views/event/show.blade.php     | 179 ++++++++++++++++---
 src/resources/views/links/create.blade.php   |   2 +-
 src/resources/views/place/show.blade.php     | 135 +++++++++++++-
 9 files changed, 402 insertions(+), 61 deletions(-)

diff --git a/src/app/Http/Controllers/EventController.php b/src/app/Http/Controllers/EventController.php
index cf30ebdc3..d6f040929 100644
--- a/src/app/Http/Controllers/EventController.php
+++ b/src/app/Http/Controllers/EventController.php
@@ -9,6 +9,8 @@
 use App\Models\Language;
 use App\Models\ListControl;
 use App\Models\Translation;
+use App\Models\Link;
+use App\Models\Crew;
 use Illuminate\View\View;
 
 class EventController extends Controller
@@ -71,7 +73,6 @@ public function store(StoreEventRequest $request)
      */
     public function show(Event $event)
     {
-        dd($event);
         return view("event.show", compact("event"));
     }
 
diff --git a/src/app/Models/Event.php b/src/app/Models/Event.php
index be9f0ff51..ae50307c7 100644
--- a/src/app/Models/Event.php
+++ b/src/app/Models/Event.php
@@ -84,4 +84,20 @@ public function user() {
             "api_log",
             "user_id");
     }
+    public function getRelationsAttribute() {
+        return [
+            $this->fromRelation,
+            $this->toRelation,
+        ];
+    }
+    public function toRelation() {
+        return $this->belongsToMany(ListRelation::class,
+            "links", "to",
+            "relation_id")->using(Link::class)->wherePivotNull("deleted_at")->withPivot("from")->withPivot("id");
+    }
+    public function fromRelation() {
+        return $this->belongsToMany(ListRelation::class,
+            "links", "from",
+            "relation_id")->using(Link::class)->wherePivotNull("deleted_at")->withPivot("to")->withPivot("id");
+    }
 }
diff --git a/src/app/Models/Link.php b/src/app/Models/Link.php
index 46cf6fc62..4e7dad534 100644
--- a/src/app/Models/Link.php
+++ b/src/app/Models/Link.php
@@ -60,16 +60,17 @@ class Link extends Pivot
     protected $encryptable = [
     ];
 
-    public static function handleApiRequest($relation) {
+    public static function handleApiRequest($relation)
+    {
 
         //update or create relation
 
         $link = Link::updateOrCreate(
             [
                 "from" => $relation["from"],
-                "to" =>  $relation["to"],
+                "to" => $relation["to"],
                 "relation_id" => $relation["relation_id"],
-                "application_id"=>$relation["application_id"]
+                "application_id" => $relation["application_id"]
             ],
             [
                 "date" => request("date"),
@@ -93,8 +94,9 @@ public static function handleApiRequest($relation) {
     }
 
     public static function relationExists($from,
-        $to, $relation_type,
-        $application_id) {
+                                          $to, $relation_type,
+                                          $application_id)
+    {
         $potential_link = self::where("application_id",
             $application_id)->where("from",
             $from)->where("to",
@@ -109,40 +111,67 @@ public static function relationExists($from,
      *
      * @return mixed
      */
-    public function getBestDescriptiveValueAttribute() {
-        return $this->refugeeFrom->bestDescriptiveValue." <-> ".$this->refugeeTo->bestDescriptiveValue;
-    }
-
-    public function refugeeFrom() {
+    public function getBestDescriptiveValueAttribute()
+    {
+        $fromValue = $this->refugeeFrom->bestDescriptiveValue
+            ?? $this->placeFrom->name
+            ?? $this->eventFrom->name
+            ?? null;
+        $toValue = $this->refugeeTo->bestDescriptiveValue
+            ?? $this->placeTo->name
+            ?? $this->eventTo->name
+            ?? null;
+
+        if ($fromValue !== null && $toValue !== null) {
+            return "{$fromValue} <-> {$toValue}";
+        }
+    }
+
+    public
+    function refugeeFrom()
+    {
         return $this->belongsTo(Refugee::class,
             "from");
     }
 
-    public function refugeeTo() {
+    public
+    function refugeeTo()
+    {
         return $this->belongsTo(Refugee::class,
             "to");
     }
 
-    public function eventFrom() {
+    public
+    function eventFrom()
+    {
         return $this->belongsTo(Event::class,
             "from");
     }
-    public function eventTo() {
+
+    public
+    function eventTo()
+    {
         return $this->belongsTo(Event::class,
             "to");
     }
 
-    public function placeFrom() {
+    public
+    function placeFrom()
+    {
         return $this->belongsTo(Place::class,
             "from");
     }
 
-    public function placeTo() {
+    public
+    function placeTo()
+    {
         return $this->belongsTo(Place::class,
             "to");
     }
 
-    public static function createLinks($relationFrom, $relationTo) {
+    public
+    static function createLinks($relationFrom, $relationTo)
+    {
         return self::whereRelation("$relationFrom.crew", 'crews.id', Auth::user()->crew->id)
             ->whereRelation("$relationTo.crew", 'crews.id', Auth::user()->crew->id)
             ->get();
@@ -151,11 +180,15 @@ public static function createLinks($relationFrom, $relationTo) {
     /**
      * @return BelongsTo
      */
-    public function relation() {
+    public
+    function relation()
+    {
         return $this->belongsTo(ListRelation::class);
     }
 
-    public function crew() {
+    public
+    function crew()
+    {
         return $this->hasOneThrough(Crew::class,
             ApiLog::class,
             "id", "id",
@@ -167,7 +200,9 @@ public function crew() {
      * Get from Id
      * @return mixed
      */
-    public function getFromId() {
+    public
+    function getFromId()
+    {
         return $this->attributes["from"];
     }
 
@@ -175,11 +210,15 @@ public function getFromId() {
      * Get to Id
      * @return mixed
      */
-    public function getToId() {
+    public
+    function getToId()
+    {
         return $this->attributes["to"];
     }
 
-    public function getRelationWeight() {
+    public
+    function getRelationWeight()
+    {
         return ListRelation::find($this->getRelationId())->importance;
     }
 
@@ -190,7 +229,9 @@ public function getRelationWeight() {
      * @param $relation
      * @return mixed
      */
-    public function getRelationId() {
+    public
+    function getRelationId()
+    {
         return $this->attributes["relation"];
     }
 
@@ -198,12 +239,14 @@ public function getRelationId() {
      * Store the relation id accorting its key or its code
      * @param $value
      */
-/*
-    public function setRelationAttribute($value) {
-        $this->attributes["relation"] = ListRelation::getIdFromValue($value);
-    }*/
+    /*
+        public function setRelationAttribute($value) {
+            $this->attributes["relation"] = ListRelation::getIdFromValue($value);
+        }*/
 
-    public function getDateAttribute() {
+    public
+    function getDateAttribute()
+    {
         return Carbon::parse($this->attributes['date']);
     }
 
diff --git a/src/app/Models/Place.php b/src/app/Models/Place.php
index 226606ea7..aa2a20897 100644
--- a/src/app/Models/Place.php
+++ b/src/app/Models/Place.php
@@ -66,4 +66,15 @@ public function crew() {
             "api_log",
             "crew_id");
     }
+    public function toRelation() {
+        return $this->belongsToMany(ListRelation::class,
+            "links", "to",
+            "relation_id")->using(Link::class)->wherePivotNull("deleted_at")->withPivot("from")->withPivot("id");
+    }
+
+    public function fromRelation() {
+        return $this->belongsToMany(ListRelation::class,
+            "links", "from",
+            "relation_id")->using(Link::class)->wherePivotNull("deleted_at")->withPivot("to")->withPivot("id");
+    }
 }
diff --git a/src/resources/lang/en/event/show.php b/src/resources/lang/en/event/show.php
index 7f957cb0f..8dc194f0d 100644
--- a/src/resources/lang/en/event/show.php
+++ b/src/resources/lang/en/event/show.php
@@ -13,8 +13,17 @@
     'stop_date' => 'Stop date',
     'coordinates' => 'Coordinates',
     'area' => 'Area',
-    'listCoordinates' => 'List of coordinates',
+    'number_of_polygons' => 'Number of polygons in the area',
     'description' => 'Description',
     'lat' => 'Latitude',
     'long' => 'Longitude',
+    'item_relations' => 'Item relations',
+    'relations' => ':name relations',
+    'view_relations_in_graph' => 'View relations in graph',
+    'from' => 'From',
+    'relation' => 'Relation',
+    'to' => 'To',
+    'add_to' => 'Add To',
+    'add_from' => 'Add from',
+    'edit'=> 'Edit',
 ];
diff --git a/src/resources/lang/en/place/show.php b/src/resources/lang/en/place/show.php
index e104ab809..630ac8fe7 100644
--- a/src/resources/lang/en/place/show.php
+++ b/src/resources/lang/en/place/show.php
@@ -12,4 +12,13 @@
         'area' => 'Area',
         'number_of_polygons' => 'Number of polygons',
     ],
+    'item_relations' => 'Item relations',
+    'relations' => ':name relations',
+    'view_relations_in_graph' => 'View relations in graph',
+    'from' => 'From',
+    'relation' => 'Relation',
+    'to' => 'To',
+    'add_to' => 'Add To',
+    'add_from' => 'Add from',
+    'edit'=> 'Edit',
 ];
diff --git a/src/resources/views/event/show.blade.php b/src/resources/views/event/show.blade.php
index 49aaa4299..84055395e 100644
--- a/src/resources/views/event/show.blade.php
+++ b/src/resources/views/event/show.blade.php
@@ -1,3 +1,4 @@
+@php use App\Models\Link; @endphp
 @section('title', __('event/show.view_event_details', ['event_name' => $event->name]))
 <x-app-layout>
     <x-slot name="header">
@@ -116,8 +117,8 @@ class="px-6 py-3 bg-gray-50 text-left text-xs font-medium
                                     </th>
                                     <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900
                                     bg-white divide-y divide-gray-200">
-                                    @if($event->coordinates)
-                                    <span>
+                                        @if($event->coordinates)
+                                            <span>
                                         <div class="row">
                                             <div class="col-4">
                                                 <span>
@@ -131,7 +132,7 @@ class="px-6 py-3 bg-gray-50 text-left text-xs font-medium
                                             </div>
                                         </div>
                                     </span>
-                                    @endif
+                                        @endif
                                     </td>
                                 </tr>
                                 <tr class="border-b">
@@ -144,14 +145,8 @@ class="px-6 py-3 bg-gray-50 text-left text-xs font-medium
                                     bg-white divide-y divide-gray-200">
                                         @if($event->area)
                                             <span>
-                                        <div class="row">
-                                            <div class="col-4">
-                                                <span>
-                                                    {{ __('event/show.listCoordinates') }} : {{ json_decode($event->area, true)['listCoordinates'] ?? ""}}
-                                                </span>
-                                            </div>
-                                        </div>
-                                    </span>
+                                                        {{ __('event/show.number_of_polygons') }} : {{ count(json_decode($event->area, true)['polygons']) ?? ""}}
+                                                    </span>
                                         @endif
                                     </td>
                                 </tr>
@@ -172,28 +167,154 @@ class="px-6 py-3 bg-gray-50 text-left text-xs font-medium
                 </div>
             </div>
             @if($event->coordinates)
-            <div class="block mb-8 mt-3">
-                <div class="-my-2 sm:-mx-6 lg:-mx-8">
-                    <div class="py-2 align-middle inline-block min-w-full sm:px-6 lg:px-8">
-                        <div style="height: 400px" class="shadow overflow-hidden border-b border-gray-200 sm:rounded-lg">
-                            @map([
-                                'lat' => json_decode($event->coordinates, true)['lat'],
-                                'lng' => json_decode($event->coordinates, true)['long'],
-                                'zoom' => 2,
-                                'markers' => [
-                                    [
-                                        'lat' => json_decode($event->coordinates, true)['lat'],
-                                        'lng' => json_decode($event->coordinates, true)['long'],
-                                        'title' => $event->name,
-                                    ],
-                                ]
-                            ])
-                            @mapscripts
+                <div class="block mb-8 mt-3">
+                    <div class="-my-2 sm:-mx-6 lg:-mx-8">
+                        <div class="py-2 align-middle inline-block min-w-full sm:px-6 lg:px-8">
+                            <div style="height: 400px"
+                                 class="shadow overflow-hidden border-b border-gray-200 sm:rounded-lg">
+                                @include('map.leaflet', [
+                                            'initialMarkers' => [
+                                                ['lat' => json_decode($event->coordinates, true)['lat'], 'lng' => json_decode($event->coordinates, true)['long']]
+                                            ],
+                                            'initialArea' => [json_decode($event->area, true)['polygons']
+                                        ]])
+                            </div>
                         </div>
                     </div>
                 </div>
-            </div>
             @endif
+            @can("viewMenu", Link::class)
+                <div class="block mt-8 mb-8 flex flex-col">
+                    <div class="-my-2 overflow-x-auto sm:-mx-6 lg:-mx-8">
+                        <div class="py-2 align-middle inline-block min-w-full sm:px-6 lg:px-8">
+                            <h2 class="font-semibold text-xl text-gray-800 leading-tight mb-8">
+                                {{ __('event/show.relation') }}
+                            </h2>
+                            <div class="shadow overflow-hidden border-b border-gray-200 sm:rounded-lg">
+                                <div class="block mb-8 mt-4">
+                                    <a href="{{ route('cytoscape.index', ["from"=>$event->id]) }}"
+                                       class="bg-gray-200 hover:bg-gray-300 hover:text-black text-black
+                                       font-bold py-2 px-4 rounded m-3">
+                                        {{ __('event/show.view_relations_in_graph') }}
+                                    </a>
+                                </div>
+                                <table class="min-w-full divide-y divide-gray-200 w-full">
+                                    <caption class="sr-only">{{ __('event/show.item_relation') }}</caption>
+                                    <thead>
+                                    <th class="px-6 py-3 bg-gray-50 text-left text-xs font-medium
+                                        text-gray-800 uppercase tracking-wider">
+                                        {{ __('event/show.from') }}
+                                    </th>
+                                    <th class="px-6 py-3 bg-gray-50 text-left text-xs font-medium
+                                        text-gray-800 uppercase tracking-wider">
+                                        {{ __('event/show.relation') }}
+                                    </th>
+                                    <th class="px-6 py-3 bg-gray-50 text-left text-xs font-medium
+                                        text-gray-800 uppercase tracking-wider">
+                                        {{ __('event/show.to') }}
+                                    </th>
+                                    <th class="px-6 py-3 bg-gray-50 text-left text-xs font-medium
+                                        text-gray-800 uppercase tracking-wider"></th>
+                                    </thead>
+                                    @if($event->relations)
+                                        @foreach($event->relations as $sided_relations)
+                                            @foreach($sided_relations as $link)
+                                                <tr class="border-b">
+                                                    <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900
+                                                bg-white divide-y divide-gray-200">
+                                                        <a href="{{route("event.show", $link->pivot->from)}}">
+                                                            @if($link->pivot->refugeeFrom)
+                                                                {{$link->pivot->refugeeFrom->best_descriptive_value }}
+                                                            @elseif($link->pivot->eventFrom)
+                                                                {{$link->pivot->eventFrom->name}}
+                                                            @elseif($link->pivot->placeFrom)
+                                                                {{$link->pivot->placeFrom->name}}
+                                                            @endif
+                                                        </a>
+                                                    </td>
+                                                    <td class="px-6 py-4 whitespace-nowrap text-sm
+                                                text-gray-900 bg-white divide-y divide-gray-200">
+                                                        {{ $link->name }}
+                                                        <small>{{$link->detail}}</small>
+                                                    </td>
+                                                    <td class="px-6 py-4 whitespace-nowrap text-sm
+                                                text-gray-900 bg-white divide-y divide-gray-200">
+                                                        <a href="{{route("event.show", $link->pivot->to)}}">
+                                                            @if($link->pivot->refugeeTo)
+                                                                {{$link->pivot->refugeeTo->best_descriptive_value }}
+                                                            @elseif($link->pivot->eventTo)
+                                                                {{$link->pivot->eventTo->name}}
+                                                            @elseif($link->pivot->placeTo)
+                                                                {{$link->pivot->placeTo->name}}
+                                                            @endif
+                                                        </a>
+                                                    </td>
+                                                    <td class="px-6 py-4 whitespace-nowrap text-sm
+                                                text-gray-900 bg-white divide-y divide-gray-200">
+                                                        <a href="{{route("links.edit", $link->pivot->id)}}">
+                                                            {{ __('event/show.edit') }}
+                                                        </a>
+                                                    </td>
+                                                </tr>
+                                            @endforeach
+                                        @endforeach
+                                    @endif
+                                    @if(Link::$quickAdd)
+                                        @can('create', Link::class)
+                                            <tr class="border-b mb-4">
+                                                <td></td>
+                                                <td></td>
+                                                <td></td>
+                                                <td></td>
+                                            </tr>
+                                            <tr class="border-b mt-4">
+                                                <td class="px-6 py-4 whitespace-nowrap text-sm
+                                                text-gray-900 bg-gray-100 divide-y divide-gray-300">
+                                                    <a href="{{ route("event.show", $event->id) }}">
+                                                        {{ $event->name }}
+                                                    </a>
+                                                </td>
+                                                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900
+                                                bg-gray-100 divide-y divide-gray-300"></td>
+
+                                                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900
+                                                bg-gray-100 divide-y divide-gray-300">
+                                                    <a href="{{ route("links.create", ["origin" => 'from', 'event' => $event]) }}"
+                                                       class="bg-green-200 hover:bg-green-300
+                                                       text-black font-bold py-2 px-4 rounded">
+                                                        {{ __('event/show.add_to') }}
+                                                    </a>
+                                                </td>
+                                                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900
+                                                bg-gray-100 divide-y divide-gray-300"></td>
+                                            </tr>
+                                            <tr class="border-b">
+                                                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900
+                                                bg-gray-100 divide-y divide-gray-300">
+                                                    <a href="{{ route("links.create", ["origin" => 'to', 'event' => $event]) }}"
+                                                       class="bg-green-200 hover:bg-green-300 text-black
+                                                       font-bold py-2 px-4 rounded">
+                                                        {{ __('event/show.add_from') }}
+                                                    </a>
+                                                </td>
+                                                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900
+                                                bg-gray-100 divide-y divide-gray-300"></td>
+                                                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900
+                                                bg-gray-100 divide-y divide-gray-300">
+                                                    <a href="{{ route("event.show", $event->id) }}">
+                                                        {{ $event->name }}
+                                                    </a>
+                                                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900
+                                                bg-gray-100 divide-y divide-gray-300"></td>
+                                            </tr>
+                                        @endcan
+                                    @endif
+                                </table>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            @endcan
             <div class="block mt-8">
                 <a href="{{ route('event.index') }}"
                    class="bg-gray-200 hover:bg-gray-300 text-black font-bold py-2 px-4 rounded">
diff --git a/src/resources/views/links/create.blade.php b/src/resources/views/links/create.blade.php
index 918c2c5f0..2bc310f44 100644
--- a/src/resources/views/links/create.blade.php
+++ b/src/resources/views/links/create.blade.php
@@ -83,7 +83,7 @@ class="bg-gray-200 hover:bg-gray-300 text-black font-bold py-2 px-4 rounded">{{
                             'title' => __('links/create.item_2'),
                             'placeHolder' => __('links/create.select_item_2'),
                             'associated_list' => $lists["all"],
-                            'previous' => old($form_elem, (!empty($refugee) && !empty($origin) && $origin == "to") ?
+                            'previous' => old($form_elem, (!empty($refugee) && !empty($event) && !empty($place) && !empty($origin) && $origin == "to") ?
                             $refugee->id : $form_elem ),
                             ])
 
diff --git a/src/resources/views/place/show.blade.php b/src/resources/views/place/show.blade.php
index 88482006a..ba138b1ab 100644
--- a/src/resources/views/place/show.blade.php
+++ b/src/resources/views/place/show.blade.php
@@ -1,5 +1,5 @@
-@php use App\Models\Place
-@endphp
+@php use App\Models\Place; @endphp
+@php use App\Models\Link; @endphp
 @section('title', __('place/show.view_place_details', ['place_name' => $place->name]))
 
 <x-app-layout>
@@ -131,7 +131,138 @@ class="shadow overflow-hidden border-b border-gray-200 sm:rounded-lg">
                     </div>
                 </div>
             </div>
+            @can("viewMenu", Link::class)
+                <div class="block mt-8 mb-8 flex flex-col">
+                    <div class="-my-2 overflow-x-auto sm:-mx-6 lg:-mx-8">
+                        <div class="py-2 align-middle inline-block min-w-full sm:px-6 lg:px-8">
+                            <h2 class="font-semibold text-xl text-gray-800 leading-tight mb-8">
+                                {{ __('place/show.relation') }}
+                            </h2>
+                            <div class="shadow overflow-hidden border-b border-gray-200 sm:rounded-lg">
+                                <div class="block mb-8 mt-4">
+                                    <a href="{{ route('cytoscape.index', ["from"=>$place->id]) }}"
+                                       class="bg-gray-200 hover:bg-gray-300 hover:text-black text-black
+                                       font-bold py-2 px-4 rounded m-3">
+                                        {{ __('place/show.view_relations_in_graph') }}
+                                    </a>
+                                </div>
+                                <table class="min-w-full divide-y divide-gray-200 w-full">
+                                    <caption class="sr-only">{{ __('place/show.item_relation') }}</caption>
+                                    <thead>
+                                    <th class="px-6 py-3 bg-gray-50 text-left text-xs font-medium
+                                        text-gray-800 uppercase tracking-wider">
+                                        {{ __('place/show.from') }}
+                                    </th>
+                                    <th class="px-6 py-3 bg-gray-50 text-left text-xs font-medium
+                                        text-gray-800 uppercase tracking-wider">
+                                        {{ __('place/show.relation') }}
+                                    </th>
+                                    <th class="px-6 py-3 bg-gray-50 text-left text-xs font-medium
+                                        text-gray-800 uppercase tracking-wider">
+                                        {{ __('place/show.to') }}
+                                    </th>
+                                    <th class="px-6 py-3 bg-gray-50 text-left text-xs font-medium
+                                        text-gray-800 uppercase tracking-wider"></th>
+                                    </thead>
+                                    @if($place->relations)
+                                        @foreach($place->relations as $sided_relations)
+                                            @foreach($sided_relations as $link)
+                                                <tr class="border-b">
+                                                    <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900
+                                                    bg-white divide-y divide-gray-200">
+                                                        <a href="{{route("place.show", $link->pivot->from)}}">
+                                                            @if($link->pivot->refugeeFrom)
+                                                                {{$link->pivot->refugeeFrom->best_descriptive_value }}
+                                                            @elseif($link->pivot->eventFrom)
+                                                                {{$link->pivot->eventFrom->name}}
+                                                            @elseif($link->pivot->placeFrom)
+                                                                {{$link->pivot->placeFrom->name}}
+                                                            @endif
+                                                        </a>
+                                                    </td>
+                                                    <td class="px-6 py-4 whitespace-nowrap text-sm
+                                                    text-gray-900 bg-white divide-y divide-gray-200">
+                                                        {{ $link->name }}
+                                                        <small>{{$link->detail}}</small>
+                                                    </td>
+                                                    <td class="px-6 py-4 whitespace-nowrap text-sm
+                                                    text-gray-900 bg-white divide-y divide-gray-200">
+                                                        <a href="{{route("place.show", $link->pivot->to)}}">
+                                                            @if($link->pivot->refugeeTo)
+                                                                {{$link->pivot->refugeeTo->best_descriptive_value }}
+                                                            @elseif($link->pivot->eventTo)
+                                                                {{$link->pivot->eventTo->name}}
+                                                            @elseif($link->pivot->placeTo)
+                                                                {{$link->pivot->placeTo->name}}
+                                                            @endif
+                                                        </a>
+                                                    </td>
+                                                    <td class="px-6 py-4 whitespace-nowrap text-sm
+                                                    text-gray-900 bg-white divide-y divide-gray-200">
+                                                        <a href="{{route("links.edit", $link->pivot->id)}}">
+                                                            {{ __('place/show.edit') }}
+                                                        </a>
+                                                    </td>
+                                                </tr>
+                                            @endforeach
+                                        @endforeach
+                                    @endif
+                                    @if(Link::$quickAdd)
+                                        @can('create', Link::class)
+                                            <tr class="border-b mb-4">
+                                                <td></td>
+                                                <td></td>
+                                                <td></td>
+                                                <td></td>
+                                            </tr>
+                                            <tr class="border-b mt-4">
+                                                <td class="px-6 py-4 whitespace-nowrap text-sm
+                                                    text-gray-900 bg-gray-100 divide-y divide-gray-300">
+                                                    <a href="{{ route("place.show", $place->id) }}">
+                                                        {{ $place->name }}
+                                                    </a>
+                                                </td>
+                                                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900
+                                                    bg-gray-100 divide-y divide-gray-300"></td>
 
+                                                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900
+                                                    bg-gray-100 divide-y divide-gray-300">
+                                                    <a href="{{ route("links.create", ["origin" => 'from', 'place' => $place]) }}"
+                                                       class="bg-green-200 hover:bg-green-300
+                                                           text-black font-bold py-2 px-4 rounded">
+                                                        {{ __('place/show.add_to') }}
+                                                    </a>
+                                                </td>
+                                                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900
+                                                    bg-gray-100 divide-y divide-gray-300"></td>
+                                            </tr>
+                                            <tr class="border-b">
+                                                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900
+                                                    bg-gray-100 divide-y divide-gray-300">
+                                                    <a href="{{ route("links.create", ["origin" => 'to', 'place' => $place]) }}"
+                                                       class="bg-green-200 hover:bg-green-300 text-black
+                                                           font-bold py-2 px-4 rounded">
+                                                        {{ __('place/show.add_from') }}
+                                                    </a>
+                                                </td>
+                                                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900
+                                                    bg-gray-100 divide-y divide-gray-300"></td>
+                                                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900
+                                                    bg-gray-100 divide-y divide-gray-300">
+                                                    <a href="{{ route("place.show", $place->id) }}">
+                                                        {{ $place->name }}
+                                                    </a>
+                                                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900
+                                                    bg-gray-100 divide-y divide-gray-300"></td>
+                                            </tr>
+                                        @endcan
+                                    @endif
+                                </table>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            @endcan
             <div class="block mt-8">
                 <a href="{{ route('place.index') }}"
                    class="bg-gray-200 hover:bg-gray-300 text-black font-bold py-2 px-4 rounded">