Merge branch 'main' into fix/extranet-data

app/assets/stylesheets/extranet/pages/_experiences.sass

-.experience__organization__logo
-    height: 100%
\ No newline at end of file
+.experience
+    line-height: px2rem(24)
+    position: relative
+    &__organization__logo
+        height: 100%
\ No newline at end of file

app/controllers/extranet/contacts/organizations_controller.rb

@@ -10,6 +10,7 @@ class Extranet::Contacts::OrganizationsController < Extranet::Contacts::Applicat
 
   def show
     @organization = current_extranet.connected_organizations.find(params[:id])
+    @current_experiences = @organization.experiences.includes(:person).current.ordered
     breadcrumb
   end
 

app/controllers/extranet/contacts/persons_controller.rb

@@ -10,6 +10,7 @@ class Extranet::Contacts::PersonsController < Extranet::Contacts::ApplicationCon
 
   def show
     @person = current_extranet.connected_persons.find(params[:id])
+    @current_experiences = @person.experiences.includes(:organization).current.ordered
     breadcrumb
   end
 

app/models/university/person/experience.rb

@@ -41,6 +41,7 @@ class University::Person::Experience < ApplicationRecord
 
   before_validation :create_organization_if_needed
 
+  scope :current, -> { where('from_year <= :current_year AND (to_year IS NULL OR to_year >= :current_year)', current_year: Date.today.year) }
   scope :ordered, -> { order('university_person_experiences.to_year DESC NULLS FIRST, university_person_experiences.from_year') }
   scope :recent, -> {
     where.not(from_year: nil)

app/views/extranet/contacts/organizations/show.html.erb

@@ -7,6 +7,36 @@
         <div class="biography mb-5">
           <%= sanitize @organization.text %>
         </div>
+        <% if @current_experiences.any? %>
+          <div class="experiences mb-5">
+            <h3><%= t('extranet.contacts.organizations.experiences', count: @current_experiences.pluck(:person_id).uniq.size) %></h3>
+
+            <% @current_experiences.each do |experience| %>
+              <article class="experience mb-4">
+                <div class="row gx-3">
+                  <div class="col-md-3">
+                    <% if experience.person.best_picture.attached? %>
+                      <%= kamifusen_tag experience.person.best_picture, width: 400, class: 'img-fluid',
+                        sizes: {
+                            '(max-width: 576px)': '400px',
+                            '(max-width: 991px)': '200px'
+                        } %>
+                    <% else %>
+                      <%= image_tag 'extranet/avatar.png', width: 400, class: 'img-fluid' %>
+                    <% end %>
+                  </div>
+                  <div class="col-md-9">
+                    <%= link_to [:contacts, experience.person], class: 'stretched-link' do %>
+                      <p>
+                        <b><%= experience.person.first_name %> <%= experience.person.last_name %></b><br>
+                        <span class="text-muted"><%= experience.description %></span>
+                      </p>
+                    <% end %>
+                  </div>
+              </article>
+            <% end %>
+          </div>
+        <% end %>
       </div>
     </div>
   </div>

app/views/extranet/contacts/persons/show.html.erb

@@ -10,10 +10,38 @@
           </p>
         <% end %>
         <% unless @person.biography.blank? %>
-          <div class="biography mt-5">
+          <div class="biography my-5">
             <%= sanitize @person&.biography %>
           </div>
         <% end %>
+        <% if @current_experiences.any? %>
+          <div class="experiences mb-5">
+            <h3><%= t('extranet.contacts.persons.experiences', count: @current_experiences.pluck(:organization_id).uniq.size) %></h3>
+
+            <% @current_experiences.each do |experience| %>
+              <article class="experience mb-4">
+                <div class="row gx-3">
+                  <div class="col-md-3">
+                    <% if experience.organization.logo.attached? %>
+                      <%= kamifusen_tag experience.organization.logo, width: 400, class: 'img-fluid',
+                        sizes: {
+                            '(max-width: 576px)': '400px',
+                            '(max-width: 991px)': '200px'
+                        } %>
+                    <% end %>
+                  </div>
+                  <div class="col-md-9">
+                    <%= link_to [:contacts, experience.organization], class: 'stretched-link' do %>
+                      <p>
+                        <b><%= experience.organization %></b><br>
+                        <span class="text-muted"><%= experience.description %></span>
+                      </p>
+                    <% end %>
+                  </div>
+              </article>
+            <% end %>
+          </div>
+        <% end %>
       </div>
     </div>
   </div>

config/locales/extranet/en.yml

@@ -8,6 +8,10 @@ en:
       updated: Updated
       logout: Log out
     contacts:
+      organizations:
+        experiences: Members of this organization (%{count})
+      persons:
+        experiences: Organizations where they belong (%{count})
       search:
         home: Search in directory
         title: Search

config/locales/extranet/fr.yml

@@ -8,6 +8,10 @@ fr:
       updated: Mise à jour effectuée
       logout: Déconnexion
     contacts:
+      organizations:
+        experiences: Membres de cette organisation (%{count})
+      persons:
+        experiences: Organisations dont iel fait partie (%{count})
       search:
         home: Chercher dans l'annuaire
         title: Recherche