Rationalisation des contacts et réseaux sociaux (#2459)

* DRY * better * clean * phone numbers and email groups * Fix * code climate * dry show * climate * edit done * fix * Fix * Update app/views/admin/application/contact_details/_show.html.erb Co-authored-by: Sébastien Gaya <sebastien.gaya@gmail.com> * fixes * public_send * fix * rename variable to attribute * Fix * fix website social_email * check form builder and attribute name for emails * fix * Fix * conditional details --------- Co-authored-by: Sébastien Gaya <sebastien.gaya@gmail.com>
osunyorg · Dec 9, 2024 · 189cc95 · 189cc95
1 parent ca267ef
commit 189cc95
Show file tree

Hide file tree

Showing 57 changed files with 838 additions and 768 deletions.
diff --git a/app/assets/stylesheets/commons/_address.sass b/app/assets/stylesheets/commons/_address.sass
@@ -0,0 +1,8 @@
+address
+    margin-bottom: 0
+    [itemprop="name"],
+    [itemprop="streetAddress"],
+    [itemprop="description"]
+        display: block
+    [itemprop="name"]
+        font-weight: bold
diff --git a/app/controllers/admin/education/schools_controller.rb b/app/controllers/admin/education/schools_controller.rb
@@ -16,6 +16,8 @@ def index
   def show
     @programs = @school.programs.ordered(current_language)
     @roles = @school.university_roles.ordered(current_language)
+    @websites = @school.websites.ordered(current_language)
+    @locations = @school.locations.ordered(current_language)
     breadcrumb
   end
 

diff --git a/app/helpers/university/people_helper.rb b/app/helpers/university/people_helper.rb
@@ -15,7 +15,7 @@ def personal_attribute_visibility_tag(visibility_value)
     hint_text = t("simple_form.hints.university_person.personal_data_visibility")
     color_class_name =  case visibility_value
                         when 'public'
-                          'bg-primary'
+                          'bg-success'
                         when 'restricted'
                           'bg-warning'
                         else

diff --git a/app/services/contact_details.rb b/app/services/contact_details.rb
@@ -1,9 +1,59 @@
 class ContactDetails
+
+  PARTS = [
+    :postal_address,
+    :phone_numbers,
+    :emails,
+    :websites,
+    :social_networks
+  ]
+
+  SOCIAL_NETWORKS = [
+    :facebook,
+    :github,
+    :instagram,
+    :linkedin,
+    :mastodon,
+    :peertube,
+    :tiktok,
+    :twitter,
+    :vimeo,
+    :x,
+    :youtube
+  ]
+
+  PHONES = [
+    :phone,
+    :phone_mobile,
+    :phone_professional,
+    :phone_personal
+  ]
+
   def self.with_kind(kind)
     "ContactDetails::#{kind.to_s.camelize}".constantize
   end
 
   def self.for(kind, string)
     with_kind(kind).new(string)
   end
+
+  def self.find_data(attribute, about, l10n, possible_prefix: nil)
+    data = find_data_in_about_or_l10n(attribute, about, l10n)
+    if data.nil?
+      prefixed_method = "#{possible_prefix}#{attribute}"
+      data = find_data_in_about_or_l10n(prefixed_method, about, l10n)
+    end
+    data
+  end
+
+  def self.find_social(attribute, about, l10n)
+    find_data(attribute, about, l10n, possible_prefix: 'social_')
+  end
+
+  protected
+
+  def self.find_data_in_about_or_l10n(method, about, l10n)
+    return about.public_send(method) if about.respond_to?(method)
+    return l10n.public_send(method) if l10n.present? && l10n.respond_to?(method)
+  end
 end
diff --git a/app/services/contact_details/phone.rb b/app/services/contact_details/phone.rb
@@ -4,13 +4,16 @@ class ContactDetails::Phone < ContactDetails::Base
 
   def prepare_value
     super
-    @value.remove! ' '
-    @value.remove! '.'
+    [' ', '.', '-'].each do |string|
+      @value.remove! string
+    end
     @value = "tel:#{@value}"
   end
 
   def prepare_label
     super
-    @label.gsub! '.', ' '
+    ['.', '-'].each do |string|
+      @label.gsub! string, ' '
+    end
   end
 end
diff --git a/app/services/osuny/address_formatter.rb b/app/services/osuny/address_formatter.rb
@@ -8,10 +8,18 @@ def initialize(about:, l10n: nil, language:)
     @language = language
   end
 
+  def present?
+    to_s.present?
+  end
+
   def address
     about.try(:address)
   end
 
+  def address_name
+    l10n.try(:address_name)
+  end
+
   def address_additional
     l10n.try(:address_additional)
   end
@@ -41,24 +49,36 @@ def to_s
   end
 
   # <address itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
+  #   <span itemprop="name">noesya</span>
   #   <span itemprop="streetAddress">15 rue des Bouviers</span>
   #   <span itemprop="description">Quartier Saint-Michel</span>
   #   <span itemprop="postalCode">33000</span> <span itemprop="addressLocality">Bordeaux</span>
   #   <span itemprop="addressCountry">FRANCE</span>
   # </address>
   def to_html
     html = '<address itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">'
-    html += " <span itemprop=\"streetAddress\">#{address}</span>" if address.present?
-    html += " <span itemprop=\"description\">#{address_additional}</span>" if address_additional.present?
-    html += " <span itemprop=\"postalCode\">#{zipcode}</span>" if zipcode.present?
-    html += " <span itemprop=\"addressLocality\">#{city}</span>" if city.present?
-    html += " <span itemprop=\"addressCountry\">#{country.upcase}</span>" if country.present?
+    html += add_if  address_name.present?,
+                    " <span itemprop=\"name\">#{address_name}</span>"
+    html += add_if  address.present?,
+                    " <span itemprop=\"streetAddress\">#{address}</span>"
+    html += add_if  address_additional.present?,
+                    " <span itemprop=\"description\">#{address_additional}</span>"
+    html += add_if  zipcode.present?,
+                    " <span itemprop=\"postalCode\">#{zipcode}</span>"
+    html += add_if  city.present?,
+                    " <span itemprop=\"addressLocality\">#{city}</span>"
+    html += add_if  country.present?,
+                    " <span itemprop=\"addressCountry\">#{country&.upcase}</span>"
     html += '</address>'
     html
   end
 
   protected
 
+  def add_if(condition, text)
+    condition ? text : ''
+  end
+
   def country_string
     about.try(:country)
   end

diff --git a/app/views/admin/administration/locations/_form.html.erb b/app/views/admin/administration/locations/_form.html.erb
@@ -5,29 +5,16 @@
     <%= lf.hidden_field :language_id, value: current_language.id %>
 
     <div class="row mb-5">
-      <div class="col-lg-4">
-        <%= render 'admin/application/featured_image/edit', f: lf, about: l10n %>
+      <div class="col-lg-3">
+        <%= lf.input :name %>
         <%= render  "admin/application/slug/form",
                     f: lf,
                     source: '#administration_location_localizations_attributes_0_name' %>
+        <%= render 'admin/application/featured_image/edit', f: lf, about: l10n %>
       </div>
-      <div class="col-lg-8">
-        <%= lf.input :name %>
+      <div class="offset-lg-1 col-lg-8">
         <%= render 'admin/application/summary/form', f: lf, about: l10n %>
-        <%= lf.input :address_name %>
-        <%= f.input :address %>
-        <%= lf.input :address_additional %>
-        <div class="row">
-          <div class="col-lg-4">
-            <%= f.input :zipcode %>
-          </div>
-          <div class="col-lg-8">
-            <%= f.input :city %>
-          </div>
-        </div>
-        <%= f.input :country, input_html: { class: 'form-select' } %>
-        <%= f.input :phone %>
-        <%= lf.input :url %>
+        <%= render 'admin/application/contact_details/edit', f: f, lf: lf, about: location, l10n: l10n %>
         <%= f.association :programs,
                           as: :check_boxes,
                           collection: osuny_collection_tree(

diff --git a/app/views/admin/administration/locations/show.html.erb b/app/views/admin/administration/locations/show.html.erb
@@ -1,40 +1,13 @@
 <% content_for :title, @l10n %>
 
-
 <div class="row">
   <div class="col-lg-3">
     <%= render 'admin/application/featured_image/show', about: @l10n, small: true %>
   </div>
   <div class="offset-lg-1 col-lg-8">
     <%= render 'admin/application/summary/show', about: @l10n, small: true %>
     <div class="mb-5">
-      <div class="row">
-        <div class="col-lg-6">
-          <%= osuny_label Administration::Location.human_attribute_name('address') %>
-          <p>
-            <% if @l10n.address_name.present? %>
-              <%= @l10n.address_name %><br>
-            <% end %>
-            <% if @location.address.present? %>
-              <%= @location.address %><br>
-            <% end %>
-            <% if @l10n.address_additional.present? %>
-              <%= @l10n.address_additional %><br>
-            <% end %>
-            <%= @location.zipcode %> <%= @location.city %> <%= @location.country %>
-          </p>
-        </div>
-        <div class="col-lg-6">
-          <% if @location.phone.present? %>
-            <%= osuny_label Administration::Location.human_attribute_name('phone') %>
-            <p><%= @location.phone %></p>
-          <% end %>
-          <% if @l10n.url.present? %>
-            <%= osuny_label Administration::Location::Localization.human_attribute_name('url') %>
-            <p><%= link_to @l10n.url, @l10n.url, target: :_blank %></p>
-          <% end %>
-        </div>
-      </div>
+      <%= render 'admin/application/contact_details/show', about: @location, l10n: @l10n %>
     </div>
     <% if @schools.any? %>
       <%= osuny_panel Administration::Location.human_attribute_name('schools'), small: true do %>

diff --git a/app/views/admin/administration/locations/static.html.erb b/app/views/admin/administration/locations/static.html.erb
@@ -12,19 +12,10 @@ language = @l10n.language
 <%= render 'admin/application/l10n/static', about: @l10n %>
 <%= render 'admin/application/featured_image/static', about: @l10n %>
 <%= render 'admin/application/summary/static', about: @l10n %>
-contact_details:
-<%= render 'admin/application/static/postal_address', about: location, l10n: @l10n, language: language %>
-<%= render 'admin/application/static/contact_detail', variable: :address, data: location.address, kind: ContactDetails::Base %>
-<%= render 'admin/application/static/contact_detail', variable: :address_name, data: @l10n.address_name, kind: ContactDetails::Base %>
-<%= render 'admin/application/static/contact_detail', variable: :address_additional, data: @l10n.address_additional, kind: ContactDetails::Base %>
-<%= render 'admin/application/static/contact_detail', variable: :zipcode, data: location.zipcode, kind: ContactDetails::Base %>
-<%= render 'admin/application/static/contact_detail', variable: :city, data: location.city, kind: ContactDetails::Base %>
-<%= render 'admin/application/static/contact_detail', variable: :country, data: location.country, kind: ContactDetails::Country %>
-<%= render 'admin/application/static/contact_detail', variable: :website, data: @l10n.url, kind: ContactDetails::Website %>
-<%= render 'admin/application/static/contact_detail', variable: :phone, data: location.phone, kind: ContactDetails::Phone %>
-  geolocation:
-    latitude: <%= location.latitude %>
-    longitude: <%= location.longitude %>
+<%= render 'admin/application/contact_details/static',
+            about: location,
+            l10n: @l10n,
+            language: language %>
 programs:
 <%
 location.programs.each do |program|

diff --git a/app/views/admin/application/contact_details/_edit.html.erb b/app/views/admin/application/contact_details/_edit.html.erb
@@ -0,0 +1,10 @@
+<%= osuny_separator %>
+<%= render "admin/application/contact_details/edit/postal_address", f: f, lf: lf, about: about, l10n: l10n %>
+<%= osuny_separator %>
+<div class="row">
+  <%= render "admin/application/contact_details/edit/phone_numbers", f: f, lf: lf, about: about, l10n: l10n %>
+  <%= render "admin/application/contact_details/edit/emails", f: f, lf: lf, about: about, l10n: l10n %>
+  <%= render "admin/application/contact_details/edit/websites", f: f, lf: lf, about: about, l10n: l10n %>
+  <%= render "admin/application/contact_details/edit/social_networks", f: f, lf: lf, about: about, l10n: l10n %>
+</div>
+<%= osuny_separator %>
diff --git a/app/views/admin/application/contact_details/_show.html.erb b/app/views/admin/application/contact_details/_show.html.erb
@@ -0,0 +1,9 @@
+<%
+# Fallback l10n to the about if not present
+l10n ||= about
+%>
+<div class="row">
+  <% ContactDetails::PARTS.each do |part| %>
+    <%= render "admin/application/contact_details/show/#{part}", about: about, l10n: l10n %>
+  <% end %>
+</div>
diff --git a/app/views/admin/application/contact_details/_static.html.erb b/app/views/admin/application/contact_details/_static.html.erb
@@ -0,0 +1,15 @@
+<% 
+depth ||= 0
+indentation = '  ' * depth
+l10n ||= nil
+language ||= l10n&.language
+%>
+<%= indentation %>contact_details:
+<% ContactDetails::PARTS.each do |part| %><%= 
+    render "admin/application/contact_details/static/#{part}", 
+            about: about,
+            l10n: l10n,
+            language: language,
+            depth: depth+1 %><% 
+end
+%>
diff --git a/app/views/admin/application/contact_details/edit/_emails.html.erb b/app/views/admin/application/contact_details/edit/_emails.html.erb
@@ -0,0 +1,22 @@
+<%
+if about.respond_to?(:email)
+  fb = f
+  attribute_name = :email
+elsif about.respond_to?(:social_email)
+  fb = f
+  attribute_name = :social_email
+elsif l10n.respond_to?(:email)
+  fb = lf
+  attribute_name = :email
+elsif l10n.respond_to?(:social_email)
+  fb = lf
+  attribute_name = :social_email
+end
+if attribute_name.present?
+%>
+  <div class="col-md-6">
+    <%= fb.input  attribute_name,
+                  label: t('contact_details.emails.email.label'),
+                  hint: t('contact_details.emails.email.hint') %>
+  </div>
+<% end %>
diff --git a/app/views/admin/application/contact_details/edit/_phone_numbers.html.erb b/app/views/admin/application/contact_details/edit/_phone_numbers.html.erb
@@ -0,0 +1,11 @@
+<%
+ContactDetails::PHONES.each do |attribute|
+  if about.respond_to?(attribute)
+    %>
+    <div class="col-md-6">
+      <%= f.input attribute,
+                  label: t("contact_details.phone_numbers.#{attribute}.label"),
+                  hint: t("contact_details.phone_numbers.#{attribute}.hint") %>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/views/admin/application/contact_details/edit/_postal_address.html.erb b/app/views/admin/application/contact_details/edit/_postal_address.html.erb
@@ -0,0 +1,30 @@
+<% if about.respond_to?(:address) %>
+  <%= lf.input  :address_name,
+                label: t('contact_details.postal_address.address_name.label'),
+                hint: t('contact_details.postal_address.address_name.hint') if l10n.respond_to?(:address_name) %>
+  <%= f.input   :address,
+                label: t('contact_details.postal_address.address.label'),
+                hint: t('contact_details.postal_address.address.hint') %>
+  <%= lf.input :address_additional,
+                label: t('contact_details.postal_address.address_additional.label'),
+                hint: t('contact_details.postal_address.address_additional.hint') if l10n.respond_to?(:address_name) %>
+  <div class="row">
+    <div class="col-lg-2">
+      <%= f.input :zipcode,
+                label: t('contact_details.postal_address.zipcode.label'),
+                hint: t('contact_details.postal_address.zipcode.hint') %>
+    </div>
+    <div class="col-lg-5">
+      <%= f.input :city,
+                label: t('contact_details.postal_address.city.label'),
+                hint: t('contact_details.postal_address.city.hint') %>
+    </div>
+    <div class="col-lg-5">
+    <%= f.input :country,
+                label: t('contact_details.postal_address.country.label'),
+                hint: t('contact_details.postal_address.country.hint'),
+                input_html: { class: 'form-select' } %>
+
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/admin/application/contact_details/edit/_social_networks.html.erb b/app/views/admin/application/contact_details/edit/_social_networks.html.erb
@@ -0,0 +1,18 @@
+<%
+ContactDetails::SOCIAL_NETWORKS.each do |attribute|
+  method_raw = attribute
+  method_prefixed = "social_#{attribute}"
+  if l10n.respond_to?(method_raw)
+    method = method_raw
+  elsif l10n.respond_to?(method_prefixed)
+    method = method_prefixed
+  else
+    next
+  end
+  %>
+  <div class="col-md-6">
+    <%= lf.input  method,
+                  label: t("contact_details.social_networks.#{attribute}.label"),
+                  hint: t("contact_details.social_networks.#{attribute}.hint") %>
+  </div>
+<% end %>