From 70bbe141a928fa715845fc7d89f9b1bda2eccdd3 Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Mon, 9 Oct 2023 15:34:34 +0100
Subject: [PATCH 1/4] Allow click-through from volunteers to profile

---
 resources/js/components/GroupVolunteer.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/GroupVolunteer.vue b/resources/js/components/GroupVolunteer.vue
index b4ead58e1..09466e1ad 100644
--- a/resources/js/components/GroupVolunteer.vue
+++ b/resources/js/components/GroupVolunteer.vue
@@ -2,7 +2,9 @@
   <div>
     <div class="pt-2 pb-2 blackbord d-flex justify-content-between">
       <div class="d-flex w-100">
-        <b-img-lazy :src="profile" class="profile mr-2" rounded="circle" @error.native="brokenProfileImage" />
+        <a :href="'/profile/' + volunteer.volunteer.id">
+          <b-img-lazy :src="profile" class="profile mr-2" rounded="circle" @error.native="brokenProfileImage" />
+        </a>
         <div class="namewidth flex-grow-1">
           <div class="d-flex flex-column">
             <div :class="{
@@ -11,9 +13,9 @@
             'd-flex': true,
             'flex-wrap': true
             }" :title="volunteer.volunteer.name">
-            <span class="pr-1 overflow-hidden ellipsis">
+            <a :href="'/profile/' + volunteer.volunteer.id" class="pr-1 overflow-hidden ellipsis text-black">
               {{ volunteer.volunteer.name }}
-            </span>
+            </a>
               <span class="host" v-if="host">
               {{ __('partials.host') }}
             </span>

From 9899ecb2fa360c7a30d8bfedad4eb62dcd1f3f76 Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Mon, 9 Oct 2023 15:53:28 +0100
Subject: [PATCH 2/4] Allow click-through from volunteers to profile

---
 resources/js/components/EventAttendance.vue   | 14 +-----
 resources/js/components/EventAttendee.vue     |  8 ++--
 resources/views/events/view.blade.php         |  2 -
 .../modals/event-all-attended.blade.php       | 44 -------------------
 .../modals/event-all-volunteers.blade.php     | 42 ------------------
 5 files changed, 6 insertions(+), 104 deletions(-)
 delete mode 100644 resources/views/includes/modals/event-all-attended.blade.php
 delete mode 100644 resources/views/includes/modals/event-all-volunteers.blade.php

diff --git a/resources/js/components/EventAttendance.vue b/resources/js/components/EventAttendance.vue
index 4d011d971..ae5f16346 100644
--- a/resources/js/components/EventAttendance.vue
+++ b/resources/js/components/EventAttendance.vue
@@ -39,21 +39,12 @@
                   {{ __('events.confirmed_none') }}
                 </p>
                 <hr />
-                <div v-if="upcoming" class="d-flex justify-content-end">
-                  <!-- TODO LATER In due course this modal should become Vue components.-->
-                  <a data-toggle="modal" data-target="#event-all-attended" href="#" class="mr-2">
-                    {{ __('events.see_all') }}
-                  </a>
-                </div>
-                <div v-else>
+                <div>
                   <div class="d-flex justify-content-between">
                     <b-btn variant="link" @click="addVolunteer">
                       {{ __('events.add_volunteer_modal_heading') }}
                     </b-btn>
                     <EventAddVolunteerModal :idevents="idevents" ref="addVolunteerModal" @hide="fetchVolunteers" />
-                  <b-btn variant="link" data-toggle="modal" data-target="#event-all-attended" href="#">
-                    {{ __('events.see_all') }}
-                    </b-btn>
                   </div>
                 </div>
               </b-tab>
@@ -73,9 +64,6 @@
                     <img class="icon" src="/images/add-icon.svg" />
                     {{ __('events.invite_to_join') }}
                   </a>
-                  <a data-toggle="modal" data-target="#event-all-volunteers" href="#" class="mr-2" v-if="invited.length">
-                    {{ __('events.see_all') }}
-                  </a>
                 </div>
               </b-tab>
             </b-tabs>
diff --git a/resources/js/components/EventAttendee.vue b/resources/js/components/EventAttendee.vue
index 672a66189..c4dfa48c3 100644
--- a/resources/js/components/EventAttendee.vue
+++ b/resources/js/components/EventAttendee.vue
@@ -2,7 +2,9 @@
   <div class="pl-4 pr-4">
     <div class="pt-2 pb-2 blackbord d-flex justify-content-between">
       <div class="d-flex w-100">
-        <b-img-lazy :src="profile" class="profile mr-2" rounded="circle" @error.native="brokenProfileImage" />
+        <a :href="'/profile/' + attendee.user">
+          <b-img-lazy :src="profile" class="profile mr-2" rounded="circle" @error.native="brokenProfileImage" />
+        </a>
         <div class="namewidth flex-grow-1">
           <div class="d-flex flex-column">
             <div :class="{
@@ -11,9 +13,9 @@
             'd-flex': true,
             'flex-wrap': true
             }" :title="name">
-            <span class="pr-1 overflow-hidden ellipsis">
+            <a :href="'/profile/' + attendee.user" class="pr-1 overflow-hidden ellipsis text-black">
               {{ name }}
-            </span>
+            </a>
               <span class="host" v-if="host">
               {{ __('partials.host') }}
             </span>
diff --git a/resources/views/events/view.blade.php b/resources/views/events/view.blade.php
index 2b0299fc4..ec008e1f2 100644
--- a/resources/views/events/view.blade.php
+++ b/resources/views/events/view.blade.php
@@ -152,8 +152,6 @@
   @include('includes.modals.event-invite-to')
   @include('includes.modals.event-description')
   @include('includes.modals.event-share-stats')
-  @include('includes.modals.event-all-volunteers')
-  @include('includes.modals.event-all-attended')
   @include('includes.modals.event-request-review')
 
 @endsection
diff --git a/resources/views/includes/modals/event-all-attended.blade.php b/resources/views/includes/modals/event-all-attended.blade.php
deleted file mode 100644
index 0bbc4dee2..000000000
--- a/resources/views/includes/modals/event-all-attended.blade.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<!-- Modal -->
-<div class="modal fade" id="event-all-attended" tabindex="-1" role="dialog" aria-labelledby="eventAllVolunteersLabel" aria-hidden="true">
-  <div class="modal-dialog modal-lg" role="document">
-
-    <div class="modal-content">
-
-      <div class="modal-header">
-
-        <h5 id="eventAllVolunteersLabel">@if( $event->hasFinished() ) @lang('events.all_restarters_attended_modal_heading') @else @lang('events.all_restarters_confirmed_modal_heading') @endif</h5>
-        @include('partials.cross')
-
-      </div>
-
-      <div class="modal-body">
-
-        <div class="row">
-          <div class="col-md-12">
-            <p>@lang('events.all_restarters_attended_modal_description')</p>
-          </div>
-        </div>
-
-        <table role="table" class="table table-striped table-hover">
-          <thead>
-            <tr>
-              <th></th>
-              <th scope="col">@lang('events.table_restarter_column')</th>
-              <th scope="col">@lang('events.table_skills_column')</th>
-              @if ( ( App\Helpers\Fixometer::hasRole(Auth::user(), 'Host') && App\Helpers\Fixometer::userHasEditPartyPermission($formdata->id, Auth::user()->id) ) || App\Helpers\Fixometer::hasRole(Auth::user(), 'Administrator'))
-                <th></th>
-              @endif
-            </tr>
-          </thead>
-          <tbody>
-            @foreach ($attended as $volunteer)
-              @include('partials.volunteer-row', ['type' => 'attended'])
-            @endforeach
-          </tbody>
-        </table>
-
-      </div>
-
-    </div>
-  </div>
-</div>
diff --git a/resources/views/includes/modals/event-all-volunteers.blade.php b/resources/views/includes/modals/event-all-volunteers.blade.php
deleted file mode 100644
index 32f37d508..000000000
--- a/resources/views/includes/modals/event-all-volunteers.blade.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- Modal -->
-<div class="modal fade" id="event-all-volunteers" tabindex="-1" role="dialog" aria-labelledby="eventAllVolunteersLabel" aria-hidden="true">
-  <div class="modal-dialog modal-lg" role="document">
-
-    <div class="modal-content">
-
-      <div class="modal-header">
-
-        <h5 id="eventAllVolunteersLabel">@lang('events.all_invited_restarters_modal_heading')</h5>
-        @include('partials.cross')
-
-      </div>
-
-      <div class="modal-body">
-
-        <div class="row">
-          <div class="col-md-12">
-            <p>@lang('events.all_invited_restarters_modal_description')</p>
-          </div>
-        </div>
-
-        <table role="table" class="table table-striped table-hover">
-          <thead>
-            <tr>
-              <th></th>
-              <th scope="col">@lang('events.table_restarter_column')</th>
-              <th scope="col">@lang('events.table_skills_column')</th>
-              <th></th>
-            </tr>
-          </thead>
-          <tbody>
-            @foreach ($invited as $volunteer)
-              @include('partials.volunteer-row', ['type' => 'invited'])
-            @endforeach
-          </tbody>
-        </table>
-
-      </div>
-
-    </div>
-  </div>
-</div>

From 2ce96606b09ca0c17229751b447da0a61aa3db16 Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Mon, 16 Oct 2023 17:16:34 +0100
Subject: [PATCH 3/4] Don't link to profile for attendees not on Restarters. 
 Change text.

---
 lang/de/events.php                        |  2 +-
 lang/en/events.php                        |  2 +-
 lang/fr-BE/events.php                     |  2 +-
 lang/fr/events.php                        |  2 +-
 resources/js/components/EventAttendee.vue | 11 +++++++++--
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/lang/de/events.php b/lang/de/events.php
index ca2ce0a73..6410af39a 100644
--- a/lang/de/events.php
+++ b/lang/de/events.php
@@ -33,7 +33,7 @@
   'volunteer_email_address' => 'Volunteer\'s email address (optional)',
   'message_volunteer_email_address' => 'This field will invite the volunteer to join the group',
   'volunteer_attended_button' => 'Volunteer attended',
-  'option_not_registered' => 'Not registered on Fixometer',
+  'option_not_registered' => 'Not registered on here',
   'option_default' => '-- Select --',
   'events' => 'Events',
   'event' => 'Event',
diff --git a/lang/en/events.php b/lang/en/events.php
index d44f7ae5b..c912d9757 100644
--- a/lang/en/events.php
+++ b/lang/en/events.php
@@ -53,7 +53,7 @@
   'volunteer_email_address' => 'Volunteer\'s email address (optional)',
   'message_volunteer_email_address' => 'This field will invite the volunteer to join the group',
   'volunteer_attended_button' => 'Volunteer attended',
-  'option_not_registered' => 'Not registered on Fixometer',
+  'option_not_registered' => 'Not registered on here',
   'option_default' => '-- Select --',
   'events' => 'Events',
   'event' => 'Event',
diff --git a/lang/fr-BE/events.php b/lang/fr-BE/events.php
index f4552510f..843734e70 100644
--- a/lang/fr-BE/events.php
+++ b/lang/fr-BE/events.php
@@ -33,7 +33,7 @@
   'volunteer_email_address' => 'Adresse e-mail du bénévole (optionnel)',
   'message_volunteer_email_address' => 'Ce champ invitera les bénévoles à rejoindre le Repair Café',
   'volunteer_attended_button' => 'Bénévoles présents',
-  'option_not_registered' => 'Pas enregistré sur le Fixometer',
+  'option_not_registered' => 'Pas enregistré sur ce site',
   'option_default' => '-- Sélectionner --',
   'events' => 'Evénements',
   'event' => 'Evénement',
diff --git a/lang/fr/events.php b/lang/fr/events.php
index f4552510f..843734e70 100644
--- a/lang/fr/events.php
+++ b/lang/fr/events.php
@@ -33,7 +33,7 @@
   'volunteer_email_address' => 'Adresse e-mail du bénévole (optionnel)',
   'message_volunteer_email_address' => 'Ce champ invitera les bénévoles à rejoindre le Repair Café',
   'volunteer_attended_button' => 'Bénévoles présents',
-  'option_not_registered' => 'Pas enregistré sur le Fixometer',
+  'option_not_registered' => 'Pas enregistré sur ce site',
   'option_default' => '-- Sélectionner --',
   'events' => 'Evénements',
   'event' => 'Evénement',
diff --git a/resources/js/components/EventAttendee.vue b/resources/js/components/EventAttendee.vue
index c4dfa48c3..1912e1351 100644
--- a/resources/js/components/EventAttendee.vue
+++ b/resources/js/components/EventAttendee.vue
@@ -2,7 +2,7 @@
   <div class="pl-4 pr-4">
     <div class="pt-2 pb-2 blackbord d-flex justify-content-between">
       <div class="d-flex w-100">
-        <a :href="'/profile/' + attendee.user">
+        <a :href="link">
           <b-img-lazy :src="profile" class="profile mr-2" rounded="circle" @error.native="brokenProfileImage" />
         </a>
         <div class="namewidth flex-grow-1">
@@ -13,7 +13,7 @@
             'd-flex': true,
             'flex-wrap': true
             }" :title="name">
-            <a :href="'/profile/' + attendee.user" class="pr-1 overflow-hidden ellipsis text-black">
+            <a :href="link" class="pr-1 overflow-hidden ellipsis text-black">
               {{ name }}
             </a>
               <span class="host" v-if="host">
@@ -68,6 +68,13 @@ export default {
     }
   },
   computed: {
+    link() {
+      if (this.attendee.user) {
+        return '/profile/' + this.attendee.user
+      } else {
+        return null
+      }
+    },
     name() {
       if (this.attendee.volunteer) {
         // Volunteer registered on Restarters.

From 46f9bfdd3e179115cbcdaacffca1e4e85af6c081 Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Mon, 23 Oct 2023 12:48:20 +0100
Subject: [PATCH 4/4] Only show "Add Volunteer" link for past events

---
 resources/js/components/EventAttendance.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/EventAttendance.vue b/resources/js/components/EventAttendance.vue
index ae5f16346..3b720ca59 100644
--- a/resources/js/components/EventAttendance.vue
+++ b/resources/js/components/EventAttendance.vue
@@ -40,7 +40,7 @@
                 </p>
                 <hr />
                 <div>
-                  <div class="d-flex justify-content-between">
+                  <div class="d-flex justify-content-between" v-if="!upcoming">
                     <b-btn variant="link" @click="addVolunteer">
                       {{ __('events.add_volunteer_modal_heading') }}
                     </b-btn>