Merge pull request #695 from TheRestartProject/RES-1948_click_through…

…_volunteer

Allow click-through from volunteers to profile

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',

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',

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',

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',

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 class="d-flex justify-content-between">
+                <div>
+                  <div class="d-flex justify-content-between" v-if="!upcoming">
                     <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>

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="link">
+          <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="link" class="pr-1 overflow-hidden ellipsis text-black">
               {{ name }}
-            </span>
+            </a>
               <span class="host" v-if="host">
               {{ __('partials.host') }}
             </span>
@@ -66,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.

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>

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